X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2Ftest%2Fpen.cpp;h=ef6eaeedf952fc4e702ec4ffe01ac6dd21e6a70d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=35ce5096acf8d8fc09fc009a054e60ae901e39a7;hpb=36d01e1527fda602a9aed07d209eb34e6770bca8;p=synfig.git

diff --git a/ETL/trunk/test/pen.cpp b/ETL/trunk/test/pen.cpp
index 35ce509..ef6eaee 100644
--- a/ETL/trunk/test/pen.cpp
+++ b/ETL/trunk/test/pen.cpp
@@ -38,8 +38,6 @@
 using namespace std;
 using namespace etl;
 
-#define DEBUGPOINT()	fprintf(stderr,__FILE__":%d: Debugpoint\n",__LINE__)
-
 /* === C L A S S E S ======================================================= */
 
 int generic_pen_test(int w, int h)
@@ -88,31 +86,31 @@ int generic_pen_test(int w, int h)
 
 	if(diff.x!=w || diff.y!=h)
 	{
-		printf("FAILURE! "__FILE__"@%d: pen difference inconsistancy ([%d,%d]!=[%d,%d])\n",__LINE__,diff.x,diff.y,w,h);
+		printf("FAILURE! "__FILE__"@%d: pen difference inconsistency ([%d,%d]!=[%d,%d])\n",__LINE__,diff.x,diff.y,w,h);
 		return 1;
 	}
 
 	if(pen.end_x()-pen.x()!=w-1)
 	{
-		printf("FAILURE! "__FILE__"@%d: iterator_x inconsistancy (%d!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
+		printf("FAILURE! "__FILE__"@%d: iterator_x inconsistency (%ld!=%d)\n",__LINE__,pen.end_x()-pen.x(),w);
 		return 1;
 	}
 
 	if(pen.end_y()-pen.y()!=h-1)
 	{
-		printf("FAILURE! "__FILE__"@%d: iterator_y inconsistancy (%d!=%d)\n",__LINE__,pen.end_y()-pen.y(),h);
+		printf("FAILURE! "__FILE__"@%d: iterator_y inconsistency (%d!=%d)\n",__LINE__,pen.end_y()-pen.y(),h);
 		return 1;
 	}
 
 	if(&pen.end_y()[-1]!=&pen.y()[(h-2)])
 	{
-		printf("FAILURE! "__FILE__"@%d: iterator_y inconsistancy\n",__LINE__);
+		printf("FAILURE! "__FILE__"@%d: iterator_y inconsistency\n",__LINE__);
 		return 1;
 	}
 
 	if(&pen.end_x()[-1]!=&pen.x()[(w-2)])
 	{
-		printf("FAILURE! "__FILE__"@%d: iterator_x inconsistancy\n",__LINE__);
+		printf("FAILURE! "__FILE__"@%d: iterator_x inconsistency\n",__LINE__);
 		return 1;
 	}
 
@@ -241,7 +239,7 @@ int box_blur_test(void)
 	{
 		for(x=0;x<w;x++,pen.inc_x())
 		{
-			if(x-y<=1 && y-x<=1 || y==h/2 || x==w/2)
+			if( (x-y<=1 && y-x<=1) || y==h/2 || x==w/2)
 				pen.put_value(2);
 			else
 				pen.put_value(0);
@@ -307,7 +305,7 @@ int box_blur_test(void)
 					if(ix < 0) ix = 0;
 					if(ix >= w) ix = w-1;
 
-					if(ix-iy<=1 && iy-ix<=1 || iy==h/2 || ix==w/2)
+					if( (ix-iy<=1 && iy-ix<=1) || iy==h/2 || ix==w/2)
 						f += 2;
 				}
 			}