svn: /gd/trunk/libgd/tests/gdimagescatterex/ bug00208_1.c bug00208_2.c

--877ccb5c7d95826ec7015fb53f100c43e09830cb
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

tabe                                     Thu, 06 Aug 2009 07:50:37 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=286870

Log:
fix to give small diffs of tolerance

Changed paths:
    U   gd/trunk/libgd/tests/gdimagescatterex/bug00208_1.c
    U   gd/trunk/libgd/tests/gdimagescatterex/bug00208_2.c

Modified: gd/trunk/libgd/tests/gdimagescatterex/bug00208_1.c
===================================================================
--- gd/trunk/libgd/tests/gdimagescatterex/bug00208_1.c	2009-08-06 07:17:03 UTC (rev 286869)
+++ gd/trunk/libgd/tests/gdimagescatterex/bug00208_1.c	2009-08-06 07:50:37 UTC (rev 286870)
@@ -3,19 +3,20 @@

 int main()
 {
-	gdImagePtr im;
+	gdImagePtr im, ex;
 	FILE *fp;
 	gdScatter s;
+	CuTestImageResult r;

 	fp = fopen(GDTEST_TOP_DIR "/gdimagescatterex/bug00208.png", "rb");
 	if (!fp) {
-		fprintf(stderr, "could not open file");
+		fprintf(stderr, "could not open file\n");
 		return 1;
 	}
 	im = gdImageCreateFromPng(fp);
 	fclose(fp);
 	if (!im) {
-		fprintf(stderr, "could not create image");
+		fprintf(stderr, "could not create image\n");
 		return 1;
 	}

@@ -25,13 +26,30 @@
 	s.num_colors = 0;
 	if (!gdImageScatterEx(im, &s)) {
 		gdImageDestroy(im);
-		fprintf(stderr, "could not scatter");
+		fprintf(stderr, "could not scatter\n");
 		return 1;
 	}

-	if (!gdAssertImageEqualsToFile(GDTEST_TOP_DIR "/gdimagescatterex/bug00208_1.png", im)) {
+	fp = fopen(GDTEST_TOP_DIR "/gdimagescatterex/bug00208_1.png", "rb");
+	if (!fp) {
+		fprintf(stderr, "could not open file\n");
 		gdImageDestroy(im);
 		return 1;
 	}
+	ex = gdImageCreateFromPng(fp);
+	fclose(fp);
+	if (!ex) {
+		fprintf(stderr, "could not create image\n");
+		gdImageDestroy(im);
+		return 1;
+	}
+	r.pixels_changed = 0;
+	gdTestImageDiff(im, ex, NULL, &r);
+	gdImageDestroy(ex);
+	gdImageDestroy(im);
+	if (r.pixels_changed > 10000) {
+		fprintf(stderr, "too much diff: %d\n", r.pixels_changed);
+		return 1;
+	}
 	return 0;
 }

Modified: gd/trunk/libgd/tests/gdimagescatterex/bug00208_2.c
===================================================================
--- gd/trunk/libgd/tests/gdimagescatterex/bug00208_2.c	2009-08-06 07:17:03 UTC (rev 286869)
+++ gd/trunk/libgd/tests/gdimagescatterex/bug00208_2.c	2009-08-06 07:50:37 UTC (rev 286870)
@@ -3,20 +3,21 @@

 int main()
 {
-	gdImagePtr im;
+	gdImagePtr im, ex;
 	FILE *fp;
 	gdScatter s;
 	int colors[] = {0xFF0000, 0x00FF00};
+	CuTestImageResult r;

 	fp = fopen(GDTEST_TOP_DIR "/gdimagescatterex/bug00208.png", "rb");
 	if (!fp) {
-		fprintf(stderr, "could not open file");
+		fprintf(stderr, "could not open file\n");
 		return 1;
 	}
 	im = gdImageCreateFromPng(fp);
 	fclose(fp);
 	if (!im) {
-		fprintf(stderr, "could not create image");
+		fprintf(stderr, "could not create image\n");
 		return 1;
 	}

@@ -27,13 +28,30 @@
 	s.colors = colors;
 	if (!gdImageScatterEx(im, &s)) {
 		gdImageDestroy(im);
-		fprintf(stderr, "could not scatter");
+		fprintf(stderr, "could not scatter\n");
 		return 1;
 	}

-	if (!gdAssertImageEqualsToFile(GDTEST_TOP_DIR "/gdimagescatterex/bug00208_2.png", im)) {
+	fp = fopen(GDTEST_TOP_DIR "/gdimagescatterex/bug00208_2.png", "rb");
+	if (!fp) {
+		fprintf(stderr, "could not open file\n");
 		gdImageDestroy(im);
 		return 1;
 	}
+	ex = gdImageCreateFromPng(fp);
+	fclose(fp);
+	if (!ex) {
+		fprintf(stderr, "could not create image\n");
+		gdImageDestroy(im);
+		return 1;
+	}
+	r.pixels_changed = 0;
+	gdTestImageDiff(im, ex, NULL, &r);
+	gdImageDestroy(ex);
+	gdImageDestroy(im);
+	if (r.pixels_changed > 10000) {
+		fprintf(stderr, "too much diff: %d\n", r.pixels_changed);
+		return 1;
+	}
 	return 0;
 }

--877ccb5c7d95826ec7015fb53f100c43e09830cb--