--- branches/dev-api-4/xvidcore/src/image/image.c	2003/02/22 08:49:45	890
+++ branches/dev-api-4/xvidcore/src/image/image.c	2003/05/22 16:36:07	1038
@@ -131,19 +131,9 @@
 image_swap(IMAGE * image1,
 		   IMAGE * image2)
 {
-	uint8_t *tmp;
-
-	tmp = image1->y;
-	image1->y = image2->y;
-	image2->y = tmp;
-
-	tmp = image1->u;
-	image1->u = image2->u;
-	image2->u = tmp;
-
-	tmp = image1->v;
-	image1->v = image2->v;
-	image2->v = tmp;
+    SWAP(uint8_t*, image1->y, image2->y);
+    SWAP(uint8_t*, image1->u, image2->u);
+    SWAP(uint8_t*, image1->v, image2->v);
 }
 
 
@@ -511,7 +501,7 @@
 #undef IMG_V
 	}
 	
-	DPRINTF(DPRINTF_DEBUG,"chroma_optimized_pixels = %i/%i", pixels, width*height/4);
+	DPRINTF(XVID_DEBUG_DEBUG,"chroma_optimized_pixels = %i/%i\n", pixels, width*height/4);
 }
 
 
@@ -1029,15 +1019,15 @@
 
 	for (y = 0; y < height; y++)
 		for (x = 0; x < width; x++)
-			sum += ABS(img1->y[x + y * stride] - img2->y[x + y * stride]);
+			sum += abs(img1->y[x + y * stride] - img2->y[x + y * stride]);
 
 	for (y = 0; y < height2; y++)
 		for (x = 0; x < width2; x++)
-			sum += ABS(img1->u[x + y * stride2] - img2->u[x + y * stride2]);
+			sum += abs(img1->u[x + y * stride2] - img2->u[x + y * stride2]);
 
 	for (y = 0; y < height2; y++)
 		for (x = 0; x < width2; x++)
-			sum += ABS(img1->v[x + y * stride2] - img2->v[x + y * stride2]);
+			sum += abs(img1->v[x + y * stride2] - img2->v[x + y * stride2]);
 
 	return (float) sum / (width * height * 3 / 2);
 }