cvs: gd(GD_2_0) /libgd/src gd.c gd.h gd_gd.c gd_gd2.c gd_gif_out.c gd_jpeg.c gd_png.c gd_wbmp.c /libgd/src/tests/gd CMakeLists.txt Makefile.am gd_im2im.c /libgd/src/tests/gd2 CMakeLists.txt Makefile.am gd2_im2im.c /libgd/src/tests/gdtest gdtest.c /libgd/src/tests/gif CMakeLists.txt Makefile.am gif_im2im.c /libgd/src/tests/jpeg CMakeLists.txt Makefile.am jpeg_im2im.c /libgd/src/tests/png CMakeLists.txt Makefile.am png_im2im.c /libgd/src/tests/wbmp CMakeLists.txt Makefile.am wbmp_im2im.c

[email protected] ("Takeshi Abe") Thu, 25 Jun 2009 19:44:44 -0000
Newsgroups php.gd.cvs
Message-ID <cvstabe1245959084@cvsserver>
--tabe1245959084
Content-Type: text/plain

tabe		Thu Jun 25 19:44:44 2009 UTC

  Added files:                 (Branch: GD_2_0)
    /gd/libgd/src/tests/gd	gd_im2im.c 
    /gd/libgd/src/tests/gd2	gd2_im2im.c 
    /gd/libgd/src/tests/gif	gif_im2im.c 
    /gd/libgd/src/tests/jpeg	jpeg_im2im.c 
    /gd/libgd/src/tests/png	png_im2im.c 
    /gd/libgd/src/tests/wbmp	wbmp_im2im.c 

  Modified files:              
    /gd/libgd/src	gd.c gd.h gd_gd.c gd_gd2.c gd_gif_out.c gd_jpeg.c 
                 	gd_png.c gd_wbmp.c 
    /gd/libgd/src/tests/gd	CMakeLists.txt Makefile.am 
    /gd/libgd/src/tests/gd2	CMakeLists.txt Makefile.am 
    /gd/libgd/src/tests/gdtest	gdtest.c 
    /gd/libgd/src/tests/gif	CMakeLists.txt Makefile.am 
    /gd/libgd/src/tests/jpeg	CMakeLists.txt Makefile.am 
    /gd/libgd/src/tests/png	CMakeLists.txt Makefile.am 
    /gd/libgd/src/tests/wbmp	CMakeLists.txt Makefile.am 
  Log:
  MFH: fixed possible segfaults when gdNewDynamicCtx() returns null
      
  * added missing gdImageEllipse()
  * remove its duplicate prototype
  
  
--tabe1245959084
Content-Type: text/plain
Content-Disposition: attachment; filename="tabe-20090625194444.txt"

http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.c?r1=1.49.2.28&r2=1.49.2.29&diff_format=u
Index: gd/libgd/src/gd.c
diff -u gd/libgd/src/gd.c:1.49.2.28 gd/libgd/src/gd.c:1.49.2.29
--- gd/libgd/src/gd.c:1.49.2.28	Tue Mar 17 17:32:08 2009
+++ gd/libgd/src/gd.c	Thu Jun 25 19:44:43 2009
@@ -1,4 +1,4 @@
-/* $Id: gd.c,v 1.49.2.28 2009/03/17 17:32:08 tabe Exp $ */
+/* $Id: gd.c,v 1.49.2.29 2009/06/25 19:44:43 tabe Exp $ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -1709,6 +1709,46 @@
     }
 }
 
+BGD_DECLARE(void) gdImageEllipse(gdImagePtr im, int mx, int my, int w, int h, int c)
+{
+	int x=0,mx1=0,mx2=0,my1=0,my2=0;
+	long aq,bq,dx,dy,r,rx,ry,a,b;
+
+	a=w>>1;
+	b=h>>1;
+	gdImageSetPixel(im,mx+a, my, c);
+	gdImageSetPixel(im,mx-a, my, c);
+	mx1 = mx-a;my1 = my;
+	mx2 = mx+a;my2 = my;
+
+	aq = a * a;
+	bq = b * b;
+	dx = aq << 1;
+	dy = bq << 1;
+	r  = a * bq;
+	rx = r << 1;
+	ry = 0;
+	x = a;
+	while (x > 0){
+		if (r > 0) {
+			my1++;my2--;
+			ry +=dx;
+			r  -=ry;
+		}
+		if (r <= 0){
+			x--;
+			mx1++;mx2--;
+			rx -=dy;
+			r  +=rx;
+		}
+		gdImageSetPixel(im,mx1, my1, c);
+		gdImageSetPixel(im,mx1, my2, c);
+		gdImageSetPixel(im,mx2, my1, c);
+		gdImageSetPixel(im,mx2, my2, c);
+	}
+}
+
+
 BGD_DECLARE(void) gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
 {
 	int x=0,mx1=0,mx2=0,my1=0,my2=0;
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd.h?r1=1.34.2.10&r2=1.34.2.11&diff_format=u
Index: gd/libgd/src/gd.h
diff -u gd/libgd/src/gd.h:1.34.2.10 gd/libgd/src/gd.h:1.34.2.11
--- gd/libgd/src/gd.h:1.34.2.10	Wed Mar 25 17:05:46 2009
+++ gd/libgd/src/gd.h	Thu Jun 25 19:44:43 2009
@@ -636,9 +636,6 @@
 /* Best to free this memory with gdFree(), not free() */
 BGD_DECLARE(void *) gdImageGd2Ptr (gdImagePtr im, int cs, int fmt, int *size);
 
-BGD_DECLARE(void) gdImageEllipse (gdImagePtr im, int cx, int cy, int w, int h,
-		       int color);
-
 /* Style is a bitwise OR ( | operator ) of these.
 	gdArc and gdChord are mutually exclusive;
 	gdChord just connects the starting and ending
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd.c?r1=1.11.2.4&r2=1.11.2.5&diff_format=u
Index: gd/libgd/src/gd_gd.c
diff -u gd/libgd/src/gd_gd.c:1.11.2.4 gd/libgd/src/gd_gd.c:1.11.2.5
--- gd/libgd/src/gd_gd.c:1.11.2.4	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_gd.c	Thu Jun 25 19:44:43 2009
@@ -326,6 +326,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   _gdImageGd (im, out);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd2.c?r1=1.21.2.3&r2=1.21.2.4&diff_format=u
Index: gd/libgd/src/gd_gd2.c
diff -u gd/libgd/src/gd_gd2.c:1.21.2.3 gd/libgd/src/gd_gd2.c:1.21.2.4
--- gd/libgd/src/gd_gd2.c:1.21.2.3	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_gd2.c	Thu Jun 25 19:44:43 2009
@@ -1056,6 +1056,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   _gdImageGd2 (im, out, cs, fmt);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_out.c?r1=1.6.2.2&r2=1.6.2.3&diff_format=u
Index: gd/libgd/src/gd_gif_out.c
diff -u gd/libgd/src/gd_gif_out.c:1.6.2.2 gd/libgd/src/gd_gif_out.c:1.6.2.3
--- gd/libgd/src/gd_gif_out.c:1.6.2.2	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_gif_out.c	Thu Jun 25 19:44:43 2009
@@ -103,6 +103,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImageGifCtx (im, out);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
@@ -148,6 +149,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImageGifAnimBeginCtx(im, out, GlobalCM, Loops);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
@@ -245,6 +247,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImageGifAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_jpeg.c?r1=1.19.2.2&r2=1.19.2.3&diff_format=u
Index: gd/libgd/src/gd_jpeg.c
diff -u gd/libgd/src/gd_jpeg.c:1.19.2.2 gd/libgd/src/gd_jpeg.c:1.19.2.3
--- gd/libgd/src/gd_jpeg.c:1.19.2.2	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_jpeg.c	Thu Jun 25 19:44:43 2009
@@ -104,6 +104,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImageJpegCtx (im, out, quality);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.21.2.9&r2=1.21.2.10&diff_format=u
Index: gd/libgd/src/gd_png.c
diff -u gd/libgd/src/gd_png.c:1.21.2.9 gd/libgd/src/gd_png.c:1.21.2.10
--- gd/libgd/src/gd_png.c:1.21.2.9	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_png.c	Thu Jun 25 19:44:43 2009
@@ -1,4 +1,4 @@
-/* $Id: gd_png.c,v 1.21.2.9 2009/06/19 17:30:36 tabe Exp $ */
+/* $Id: gd_png.c,v 1.21.2.10 2009/06/25 19:44:43 tabe Exp $ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -472,6 +472,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImagePngCtxEx (im, out, -1);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
@@ -482,6 +483,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImagePngCtxEx (im, out, level);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_wbmp.c?r1=1.10.2.3&r2=1.10.2.4&diff_format=u
Index: gd/libgd/src/gd_wbmp.c
diff -u gd/libgd/src/gd_wbmp.c:1.10.2.3 gd/libgd/src/gd_wbmp.c:1.10.2.4
--- gd/libgd/src/gd_wbmp.c:1.10.2.3	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/gd_wbmp.c	Thu Jun 25 19:44:43 2009
@@ -228,6 +228,7 @@
 {
   void *rv;
   gdIOCtx *out = gdNewDynamicCtx (2048, NULL);
+  if (out == NULL) return NULL;
   gdImageWBMPCtx (im, fg, out);
   rv = gdDPExtractData (out, size);
   out->gd_free (out);
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/CMakeLists.txt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/src/tests/gd/CMakeLists.txt
diff -u gd/libgd/src/tests/gd/CMakeLists.txt:1.1.2.1 gd/libgd/src/tests/gd/CMakeLists.txt:1.1.2.2
--- gd/libgd/src/tests/gd/CMakeLists.txt:1.1.2.1	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/tests/gd/CMakeLists.txt	Thu Jun 25 19:44:43 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	gd_im2im
 	gd_null
 )
 
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/Makefile.am?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/src/tests/gd/Makefile.am
diff -u gd/libgd/src/tests/gd/Makefile.am:1.1.2.1 gd/libgd/src/tests/gd/Makefile.am:1.1.2.2
--- gd/libgd/src/tests/gd/Makefile.am:1.1.2.1	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/tests/gd/Makefile.am	Thu Jun 25 19:44:43 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt gd_null.c
+EXTRA_DIST = CMakeLists.txt gd_im2im.c gd_null.c
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/CMakeLists.txt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: gd/libgd/src/tests/gd2/CMakeLists.txt
diff -u gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.4 gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.5
--- gd/libgd/src/tests/gd2/CMakeLists.txt:1.1.2.4	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/tests/gd2/CMakeLists.txt	Thu Jun 25 19:44:44 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	gd2_im2im
 	gd2_read
 	gd2_empty_file
 	gd2_null
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/Makefile.am?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: gd/libgd/src/tests/gd2/Makefile.am
diff -u gd/libgd/src/tests/gd2/Makefile.am:1.1.2.3 gd/libgd/src/tests/gd2/Makefile.am:1.1.2.4
--- gd/libgd/src/tests/gd2/Makefile.am:1.1.2.3	Fri Jun 19 17:30:36 2009
+++ gd/libgd/src/tests/gd2/Makefile.am	Thu Jun 25 19:44:44 2009
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_read.c gd2_null.c
+EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_im2im.c gd2_read.c gd2_null.c
 
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdtest/gdtest.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: gd/libgd/src/tests/gdtest/gdtest.c
diff -u gd/libgd/src/tests/gdtest/gdtest.c:1.1.2.3 gd/libgd/src/tests/gdtest/gdtest.c:1.1.2.4
--- gd/libgd/src/tests/gdtest/gdtest.c:1.1.2.3	Tue Apr 10 20:32:36 2007
+++ gd/libgd/src/tests/gdtest/gdtest.c	Thu Jun 25 19:44:44 2009
@@ -37,8 +37,6 @@
 	gdImagePtr buf_diff, CuTestImageResult *result_ret)
 {
 	int x, y;
-	CuTestImageResult result = {0, 0};
-
 	int c1, c2;
 
 	for (y = 0; y < gdImageSY(buf_a); y++) {
@@ -96,15 +94,13 @@
 					diff_b = 255;
 				}
 
-				result.pixels_changed++;
-				gdImageSetPixel(buf_diff, x,y, gdTrueColorAlpha(diff_r, diff_g, diff_b, diff_a));
+				result_ret->pixels_changed++;
+				if (buf_diff) gdImageSetPixel(buf_diff, x,y, gdTrueColorAlpha(diff_r, diff_g, diff_b, diff_a));
 			} else {
-				gdImageSetPixel(buf_diff, x,y, gdTrueColorAlpha(255,255,255,0));
+				if (buf_diff) gdImageSetPixel(buf_diff, x,y, gdTrueColorAlpha(255,255,255,0));
 			}
 		}
 	}
-
-	*result_ret = result;
 }
 
 int gdTestImageCompareToImage(const char* file, int line, const char* message,
@@ -114,7 +110,7 @@
 	unsigned int width_a, height_a;
 	unsigned int width_b, height_b;
 	gdImagePtr surface_diff = NULL;
-	CuTestImageResult result;
+	CuTestImageResult result = {0, 0};
 
 	if (!actual) {
 		fprintf(stderr, "Image is NULL\n");
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/CMakeLists.txt?r1=1.1.2.7&r2=1.1.2.8&diff_format=u
Index: gd/libgd/src/tests/gif/CMakeLists.txt
diff -u gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.7 gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.8
--- gd/libgd/src/tests/gif/CMakeLists.txt:1.1.2.7	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/gif/CMakeLists.txt	Thu Jun 25 19:44:44 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	gif_im2im
 	gif_null
 	bug00005
 	bug00005_2
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/Makefile.am?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: gd/libgd/src/tests/gif/Makefile.am
diff -u gd/libgd/src/tests/gif/Makefile.am:1.1.2.3 gd/libgd/src/tests/gif/Makefile.am:1.1.2.4
--- gd/libgd/src/tests/gif/Makefile.am:1.1.2.3	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/gif/Makefile.am	Thu Jun 25 19:44:44 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif  bug00005_2_exp.png  bug00005_3.gif  bug00006.c  bug00060.gif  bug00066_exp.png bug00181.c
+EXTRA_DIST = CMakeLists.txt gif_im2im.c gif_null.c bug00005_0.gif bug00005_2.c bug00005_2.gif bug00005.c bug00060.c bug00066.c bug00066.gif bug00005_1.gif  bug00005_2_exp.png  bug00005_3.gif  bug00006.c  bug00060.gif  bug00066_exp.png bug00181.c
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/CMakeLists.txt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: gd/libgd/src/tests/jpeg/CMakeLists.txt
diff -u gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.4 gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.5
--- gd/libgd/src/tests/jpeg/CMakeLists.txt:1.1.2.4	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/jpeg/CMakeLists.txt	Thu Jun 25 19:44:44 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	jpeg_im2im
 	jpeg_read
 	jpeg_empty_file
 	jpeg_null
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/Makefile.am?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: gd/libgd/src/tests/jpeg/Makefile.am
diff -u gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.2 gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.3
--- gd/libgd/src/tests/jpeg/Makefile.am:1.1.2.2	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/jpeg/Makefile.am	Thu Jun 25 19:44:44 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_null.c jpeg_read.c
+EXTRA_DIST = CMakeLists.txt conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_im2im.c jpeg_null.c jpeg_read.c
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/CMakeLists.txt?r1=1.1.2.7&r2=1.1.2.8&diff_format=u
Index: gd/libgd/src/tests/png/CMakeLists.txt
diff -u gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.7 gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.8
--- gd/libgd/src/tests/png/CMakeLists.txt:1.1.2.7	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/png/CMakeLists.txt	Thu Jun 25 19:44:44 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	png_im2im
 	png_null
 	bug00011
 	bug00033
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/Makefile.am?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: gd/libgd/src/tests/png/Makefile.am
diff -u gd/libgd/src/tests/png/Makefile.am:1.1.2.3 gd/libgd/src/tests/png/Makefile.am:1.1.2.4
--- gd/libgd/src/tests/png/Makefile.am:1.1.2.3	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/png/Makefile.am	Thu Jun 25 19:44:44 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt png_null.c bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile
+EXTRA_DIST = CMakeLists.txt png_im2im.c png_null.c bug00011.c bug00033.png bug00088_1_exp.png bug00088_2_exp.png bug00088.c bug00033.c bug00086.c bug00088_1.png bug00088_2.png bug00193.c emptyfile
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/CMakeLists.txt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/src/tests/wbmp/CMakeLists.txt
diff -u gd/libgd/src/tests/wbmp/CMakeLists.txt:1.1.2.1 gd/libgd/src/tests/wbmp/CMakeLists.txt:1.1.2.2
--- gd/libgd/src/tests/wbmp/CMakeLists.txt:1.1.2.1	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/wbmp/CMakeLists.txt	Thu Jun 25 19:44:44 2009
@@ -1,5 +1,6 @@
 
 SET(TESTS_FILES
+	wbmp_im2im
 	wbmp_null
 )
 
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/Makefile.am?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/src/tests/wbmp/Makefile.am
diff -u gd/libgd/src/tests/wbmp/Makefile.am:1.1.2.1 gd/libgd/src/tests/wbmp/Makefile.am:1.1.2.2
--- gd/libgd/src/tests/wbmp/Makefile.am:1.1.2.1	Fri Jun 19 17:30:37 2009
+++ gd/libgd/src/tests/wbmp/Makefile.am	Thu Jun 25 19:44:44 2009
@@ -1,3 +1,3 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 
-EXTRA_DIST = CMakeLists.txt wbmp_null.c
+EXTRA_DIST = CMakeLists.txt wbmp_im2im.c wbmp_null.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd/gd_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/gd/gd_im2im.c
+++ gd/libgd/src/tests/gd/gd_im2im.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gd2/gd2_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/gd2/gd2_im2im.c
+++ gd/libgd/src/tests/gd2/gd2_im2im.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gif/gif_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/gif/gif_im2im.c
+++ gd/libgd/src/tests/gif/gif_im2im.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/jpeg/jpeg_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/jpeg/jpeg_im2im.c
+++ gd/libgd/src/tests/jpeg/jpeg_im2im.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/png/png_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/png/png_im2im.c
+++ gd/libgd/src/tests/png/png_im2im.c

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/wbmp/wbmp_im2im.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/wbmp/wbmp_im2im.c
+++ gd/libgd/src/tests/wbmp/wbmp_im2im.c

--tabe1245959084--