--- trunk/xvidcore/src/image/image.c	2002/09/25 23:37:09	541
+++ trunk/xvidcore/src/image/image.c	2002/11/26 23:44:11	677
@@ -5,17 +5,10 @@
  *
  *  Copyright(C) 2002 Peter Ross <pross@xvid.org>
  *
- *  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.
+ *  This file is part of XviD, a free MPEG-4 video encoder/decoder
  *
- *  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
+ *  XviD 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.
  *
@@ -28,14 +21,45 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
+ *  Under section 8 of the GNU General Public License, the copyright
+ *  holders of XVID explicitly forbid distribution in the following
+ *  countries:
+ *
+ *    - Japan
+ *    - United States of America
+ *
+ *  Linking XviD statically or dynamically with other modules is making a
+ *  combined work based on XviD.  Thus, the terms and conditions of the
+ *  GNU General Public License cover the whole combination.
+ *
+ *  As a special exception, the copyright holders of XviD give you
+ *  permission to link XviD with independent modules that communicate with
+ *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+ *  license terms of these independent modules, and to copy and distribute
+ *  the resulting combined work under terms of your choice, provided that
+ *  every copy of the combined work is accompanied by a complete copy of
+ *  the source code of XviD (the version of XviD used to produce the
+ *  combined work), being distributed under the terms of the GNU General
+ *  Public License plus this exception.  An independent module is a module
+ *  which is not derived from or based on XviD.
+ *
+ *  Note that people who make modified versions of XviD are not obligated
+ *  to grant this special exception for their modified versions; it is
+ *  their choice whether to do so.  The GNU General Public License gives
+ *  permission to release a modified version without this exception; this
+ *  exception also makes it possible to release a modified version which
+ *  carries forward this exception.
+ *
+ * $Id: image.c,v 1.25 2002-11-26 23:44:10 edgomez Exp $
+ *
  ****************************************************************************/
 
 #include <stdlib.h>
-#include <string.h>				// memcpy, memset
+#include <string.h>				/* memcpy, memset */
 #include <math.h>
 
 #include "../portab.h"
-#include "../xvid.h"			// XVID_CSP_XXX's
+#include "../xvid.h"			/* XVID_CSP_XXX's */
 #include "image.h"
 #include "colorspace.h"
 #include "interpolate8x8.h"
@@ -179,7 +203,7 @@
 	}
 
 
-//U
+/*U */
 	dst = image->u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
 	src = image->u;
 
@@ -207,7 +231,7 @@
 	}
 
 
-// V
+/* V */
 	dst = image->v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
 	src = image->v;
 
@@ -235,7 +259,7 @@
 	}
 }
 
-// bframe encoding requires image-based u,v interpolation
+/* bframe encoding requires image-based u,v interpolation */
 void
 image_interpolate(const IMAGE * refn,
 				  IMAGE * refh,
@@ -458,7 +482,7 @@
 					edged_width / 2, width, height);
 		return 0;
 
-	case XVID_CSP_YV12:		// u,v swapped
+	case XVID_CSP_YV12:		/* u,v swapped */
 		yv12_to_yuv(dst, dst_stride, image->y, image->v, image->u, edged_width,
 					edged_width / 2, width, height);
 		return 0;
@@ -468,7 +492,7 @@
 					 edged_width, edged_width / 2, width, height);
 		return 0;
 
-	case XVID_CSP_YVYU:		// u,v swapped
+	case XVID_CSP_YVYU:		/* u,v swapped */
 		yv12_to_yuyv(dst, dst_stride, image->y, image->v, image->u,
 					 edged_width, edged_width / 2, width, height);
 		return 0;
@@ -527,7 +551,7 @@
 	return psnr_y;
 }
 
-/*
+#if	0
 
 #include <stdio.h>
 #include <string.h>
@@ -551,7 +575,7 @@
 }
 
 
-// dump image+edges to yuv pgm files 
+/* dump image+edges to yuv pgm files  */
 
 int image_dump(IMAGE * image, uint32_t edged_width, uint32_t edged_height, char * path, int number)
 {
@@ -574,7 +598,7 @@
 
 	return 0;
 }
-*/
+#endif