--- branches/dev-api-4/xvidcore/src/image/image.c	2003/06/09 01:25:19	1053
+++ branches/dev-api-4/xvidcore/src/image/image.c	2003/08/25 15:01:51	1128
@@ -1,53 +1,27 @@
 /**************************************************************************
  *
- *	XVID MPEG-4 VIDEO CODEC
- *	image stuff
+ *  XVID MPEG-4 VIDEO CODEC
+ *  - Image management functions -
  *
- *	This program is an implementation of a part of one or more MPEG-4
- *	Video tools as specified in ISO/IEC 14496-2 standard.  Those intending
- *	to use this software module in hardware or software products are
- *	advised that its use may infringe existing patents or copyrights, and
- *	any such use would be at such party's own risk.  The original
- *	developer of this software module and his/her company, and subsequent
- *	editors and their companies, will have no liability for use of this
- *	software or modifications or derivatives thereof.
+ *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
  *
- *	This program is free software; you can redistribute it and/or modify
- *	it under the terms of the GNU General Public License as published by
- *	the Free Software Foundation; either version 2 of the License, or
- *	(at your option) any later version.
+ *  This program is free software ; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation ; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- *	This program is distributed in the hope that it will be useful,
- *	but WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *	GNU General Public License for more details.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY ; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- *	You should have received a copy of the GNU General Public License
- *	along with this program; if not, write to the Free Software
- *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program ; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- *************************************************************************/
-
-/**************************************************************************
- *
- *	History:
+ * $Id: image.c,v 1.26.2.8 2003-08-25 15:01:51 edgomez Exp $
  *
- *  05.10.2002	support for interpolated images in qpel mode - Isibaar
- *	01.05.2002	BFRAME image-based u,v interpolation
- *  22.04.2002  added some B-frame support
- *	14.04.2002	added image_dump_yuvpgm(), added image_mad()
- *              XVID_CSP_USER input support
- *  09.04.2002  PSNR calculations - Isibaar
- *	06.04.2002	removed interlaced edging from U,V blocks (as per spec)
- *  26.03.2002  interlacing support (field-based edging in set_edges)
- *	26.01.2002	rgb555, rgb565
- *	07.01.2001	commented u,v interpolation (not required for uv-block-based)
- *  23.12.2001  removed #ifdefs, added function pointers + init_common()
- *	22.12.2001	cpu #ifdefs
- *  19.12.2001  image_dump(); useful for debugging
- *	 6.12.2001	inital version; (c)2001 peter ross <pross@cs.rmit.edu.au>
- *
- *************************************************************************/
+ ****************************************************************************/
 
 #include <stdlib.h>
 #include <string.h>				/* memcpy, memset */
@@ -157,7 +131,7 @@
 			   uint32_t height)
 {
 	const uint32_t edged_width2 = edged_width / 2;
-	const uint32_t width2 = width / 2;
+	uint32_t width2;
 	uint32_t i;
 	uint8_t *dst;
 	uint8_t *src;
@@ -166,6 +140,12 @@
 	dst = image->y - (EDGE_SIZE + EDGE_SIZE * edged_width);
 	src = image->y;
 
+	/* According to the Standard Clause 7.6.4, padding is done starting at 16
+	 * pixel width and height multiples */
+	width  = (width+15)&~15;
+	height = (height+15)&~15;
+	width2 = width/2;
+
 	for (i = 0; i < EDGE_SIZE; i++) {
 		memset(dst, *src, EDGE_SIZE);
 		memcpy(dst + EDGE_SIZE, src, width);