cvs: gd /libgd/src gd_bmp.c gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_jpeg.c gd_png.c gd_tga.c gd_tiff.c gd_wbmp.c /libgd/tests
CMakeLists.txt Makefile.am /libgd/tests/bmp CMakeLists.txt Makefile.am bmp_null.c /libgd/tests/gd CMakeLists.txt Makefile.am gd_null.c
/libgd/tests/gd2 CMakeLists.txt Makefile.am gd2_null.c /libgd/tests/gdnewfilectx CMakeLists.txt Makefile.am gdnewfilectx_null.c /libgd/tests/gif
CMakeLists.txt Makefile.am gif_null.c /libgd/tests/jpeg CMakeLists.txt Makefile.am jpeg_null.c /libgd/tests/png CMakeLists.txt Makefile.am
png_null.c /libgd/tests/tga CMakeLists.txt Makefile.am tga_null.c /libgd/tests/tiff CMakeLists.txt Makefile.am tiff_null.c /libgd/tests/wbmp
CMakeLists.txt Makefile.am wbmp_null.c
| From: | Takeshi Abe | Date: | Thu, 18 Jun 2009 13:35:26 +0000 |
| Subject: | cvs: gd /libgd/src gd_bmp.c gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_jpeg.c gd_png.c gd_tga.c gd_tiff.c gd_wbmp.c /libgd/tests CMakeLists.txt Makefile.am /libgd/tests/bmp CMakeLists.txt Makefile.am bmp_null.c /libgd/tests/gd CMakeLists.txt Makefile.am gd_null.c /libgd/tests/gd2 CMakeLists.txt Makefile.am gd2_null.c /libgd/tests/gdnewfilectx CMakeLists.txt Makefile.am gdnewfilectx_null.c /libgd/tests/gif CMakeLists.txt Makefile.am gif_null.c /libgd/tests/jpeg CMakeLists.txt Makefile.am jpeg_null.c /libgd/tests/png CMakeLists.txt Makefile.am png_null.c /libgd/tests/tga CMakeLists.txt Makefile.am tga_null.c /libgd/tests/tiff CMakeLists.txt Makefile.am tiff_null.c /libgd/tests/wbmp CMakeLists.txt Makefile.am wbmp_null.c |
||
| Groups: | php.gd.cvs | ||
| Request: | Send a blank email to php-gd-cvs+get-617@lists.php.net to get a copy of this message | ||
tabe Thu Jun 18 13:35:26 2009 UTC
Added files:
/gd/libgd/tests/bmp CMakeLists.txt Makefile.am bmp_null.c
/gd/libgd/tests/gd CMakeLists.txt Makefile.am gd_null.c
/gd/libgd/tests/gd2 gd2_null.c
/gd/libgd/tests/gdnewfilectx CMakeLists.txt Makefile.am
gdnewfilectx_null.c
/gd/libgd/tests/gif gif_null.c
/gd/libgd/tests/jpeg jpeg_null.c
/gd/libgd/tests/png png_null.c
/gd/libgd/tests/tga CMakeLists.txt Makefile.am tga_null.c
/gd/libgd/tests/tiff CMakeLists.txt Makefile.am tiff_null.c
/gd/libgd/tests/wbmp CMakeLists.txt Makefile.am wbmp_null.c
Modified files:
/gd/libgd/src gd_bmp.c gd_gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c
gd_io_file.c gd_jpeg.c gd_png.c gd_tga.c gd_tiff.c
gd_wbmp.c
/gd/libgd/tests CMakeLists.txt Makefile.am
/gd/libgd/tests/gd2 CMakeLists.txt Makefile.am
/gd/libgd/tests/gif CMakeLists.txt Makefile.am
/gd/libgd/tests/jpeg CMakeLists.txt Makefile.am
/gd/libgd/tests/png CMakeLists.txt Makefile.am
Log:
fix for FS#204
* gdImageCreateFrom*() returns null if null pointer given
* gdImage*() puts nothing if null pointer given
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_bmp.c?r1=1.1&r2=1.2&diff_format=u Index: gd/libgd/src/gd_bmp.c diff -u gd/libgd/src/gd_bmp.c:1.1 gd/libgd/src/gd_bmp.c:1.2 --- gd/libgd/src/gd_bmp.c:1.1 Sat May 31 19:51:14 2008 +++ gd/libgd/src/gd_bmp.c Thu Jun 18 13:35:25 2009 @@ -12,7 +12,7 @@ ---------------------------------------------------------------------------- */ -/* $Id: gd_bmp.c,v 1.1 2008/05/31 19:51:14 scottmac Exp $ */ +/* $Id: gd_bmp.c,v 1.2 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -73,6 +73,7 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageBmpCtx(im, out, compression); out->gd_free(out); } @@ -402,6 +403,7 @@ { gdImagePtr im = 0; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromBmpCtx(in); in->gd_free(in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd.c?r1=1.14&r2=1.15&diff_format=u Index: gd/libgd/src/gd_gd.c diff -u gd/libgd/src/gd_gd.c:1.14 gd/libgd/src/gd_gd.c:1.15 --- gd/libgd/src/gd_gd.c:1.14 Tue Feb 24 07:59:08 2009 +++ gd/libgd/src/gd_gd.c Thu Jun 18 13:35:25 2009 @@ -171,6 +171,7 @@ gdIOCtx *in; in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGdCtx (in); in->gd_free (in); @@ -316,6 +317,7 @@ BGD_DECLARE(void) gdImageGd (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd (im, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd2.c?r1=1.23&r2=1.24&diff_format=u Index: gd/libgd/src/gd_gd2.c diff -u gd/libgd/src/gd_gd2.c:1.23 gd/libgd/src/gd_gd2.c:1.24 --- gd/libgd/src/gd_gd2.c:1.23 Sun Nov 25 19:45:43 2007 +++ gd/libgd/src/gd_gd2.c Thu Jun 18 13:35:25 2009 @@ -282,6 +282,7 @@ gdIOCtx *in = gdNewFileCtx (inFile); gdImagePtr im; + if (in == NULL) return NULL; im = gdImageCreateFromGd2Ctx (in); in->gd_free (in); @@ -492,6 +493,7 @@ gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGd2PartCtx (in, srcx, srcy, w, h); in->gd_free (in); @@ -1045,6 +1047,7 @@ BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd2 (im, out, cs, fmt); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_in.c?r1=1.11&r2=1.12&diff_format=u Index: gd/libgd/src/gd_gif_in.c diff -u gd/libgd/src/gd_gif_in.c:1.11 gd/libgd/src/gd_gif_in.c:1.12 --- gd/libgd/src/gd_gif_in.c:1.11 Tue Oct 23 05:35:02 2007 +++ gd/libgd/src/gd_gif_in.c Thu Jun 18 13:35:25 2009 @@ -101,8 +101,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGif(FILE *fdFile) { gdIOCtx *fd = gdNewFileCtx(fdFile); - gdImagePtr im = 0; + gdImagePtr im; + if (fd == NULL) return NULL; im = gdImageCreateFromGifCtx(fd); fd->gd_free(fd); http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_out.c?r1=1.9&r2=1.10&diff_format=u Index: gd/libgd/src/gd_gif_out.c diff -u gd/libgd/src/gd_gif_out.c:1.9 gd/libgd/src/gd_gif_out.c:1.10 --- gd/libgd/src/gd_gif_out.c:1.9 Mon Nov 3 13:24:36 2008 +++ gd/libgd/src/gd_gif_out.c Thu Jun 18 13:35:25 2009 @@ -102,6 +102,7 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifCtx(im, out); out->gd_free(out); } @@ -150,6 +151,7 @@ BGD_DECLARE(void) gdImageGifAnimBegin(gdImagePtr im, FILE *outFile, int GlobalCM, int Loops) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimBeginCtx(im, out, GlobalCM, Loops); out->gd_free(out); } @@ -231,6 +233,7 @@ BGD_DECLARE(void) gdImageGifAnimAdd(gdImagePtr im, FILE *outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal, gdImagePtr previm) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); out->gd_free(out); } @@ -453,6 +456,7 @@ putc(';', outFile); #else gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimEndCtx(out); out->gd_free(out); #endif http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_io_file.c?r1=1.11&r2=1.12&diff_format=u Index: gd/libgd/src/gd_io_file.c diff -u gd/libgd/src/gd_io_file.c:1.11 gd/libgd/src/gd_io_file.c:1.12 --- gd/libgd/src/gd_io_file.c:1.11 Fri Dec 21 22:02:50 2007 +++ gd/libgd/src/gd_io_file.c Thu Jun 18 13:35:25 2009 @@ -54,6 +54,7 @@ { fileIOCtx *ctx; + if (f == NULL) return NULL; ctx = (fileIOCtx *)gdMalloc(sizeof(fileIOCtx)); if(ctx == NULL) { return NULL; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_jpeg.c?r1=1.25&r2=1.26&diff_format=u Index: gd/libgd/src/gd_jpeg.c diff -u gd/libgd/src/gd_jpeg.c:1.25 gd/libgd/src/gd_jpeg.c:1.26 --- gd/libgd/src/gd_jpeg.c:1.25 Sun Mar 8 09:16:04 2009 +++ gd/libgd/src/gd_jpeg.c Thu Jun 18 13:35:25 2009 @@ -95,6 +95,7 @@ BGD_DECLARE(void) gdImageJpeg(gdImagePtr im, FILE *outFile, int quality) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageJpegCtx(im, out, quality); out->gd_free(out); } @@ -265,6 +266,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromJpegCtx(in); in->gd_free(in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.32&r2=1.33&diff_format=u Index: gd/libgd/src/gd_png.c diff -u gd/libgd/src/gd_png.c:1.32 gd/libgd/src/gd_png.c:1.33 --- gd/libgd/src/gd_png.c:1.32 Tue Mar 31 16:17:23 2009 +++ gd/libgd/src/gd_png.c Thu Jun 18 13:35:25 2009 @@ -1,4 +1,4 @@ -/* $Id: gd_png.c,v 1.32 2009/03/31 16:17:23 tabe Exp $ */ +/* $Id: gd_png.c,v 1.33 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -101,6 +101,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromPngCtx (in); in->gd_free (in); return im; @@ -467,6 +468,7 @@ BGD_DECLARE(void) gdImagePngEx (gdImagePtr im, FILE * outFile, int level) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, level); out->gd_free (out); } @@ -474,6 +476,7 @@ BGD_DECLARE(void) gdImagePng (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, -1); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tga.c?r1=1.12&r2=1.13&diff_format=u Index: gd/libgd/src/gd_tga.c diff -u gd/libgd/src/gd_tga.c:1.12 gd/libgd/src/gd_tga.c:1.13 --- gd/libgd/src/gd_tga.c:1.12 Wed Jul 30 01:53:13 2008 +++ gd/libgd/src/gd_tga.c Thu Jun 18 13:35:25 2009 @@ -16,6 +16,7 @@ { gdImagePtr image; gdIOCtx* in = gdNewFileCtx(fp); + if (in == NULL) return NULL; image = gdImageCreateFromTgaCtx(in); in->gd_free( in ); return image; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tiff.c?r1=1.21&r2=1.22&diff_format=u Index: gd/libgd/src/gd_tiff.c diff -u gd/libgd/src/gd_tiff.c:1.21 gd/libgd/src/gd_tiff.c:1.22 --- gd/libgd/src/gd_tiff.c:1.21 Wed Mar 4 11:55:18 2009 +++ gd/libgd/src/gd_tiff.c Thu Jun 18 13:35:25 2009 @@ -27,7 +27,7 @@ ---------------------------------------------------------------------------- */ -/* $Id: gd_tiff.c,v 1.21 2009/03/04 11:55:18 tabe Exp $ */ +/* $Id: gd_tiff.c,v 1.22 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -981,6 +981,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromTiffCtx(in); in->gd_free(in); return im; @@ -1001,6 +1002,7 @@ BGD_DECLARE(void) gdImageTiff(gdImagePtr im, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageTiffCtx(im, out); /* what's an fg again? */ out->gd_free(out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_wbmp.c?r1=1.13&r2=1.14&diff_format=u Index: gd/libgd/src/gd_wbmp.c diff -u gd/libgd/src/gd_wbmp.c:1.13 gd/libgd/src/gd_wbmp.c:1.14 --- gd/libgd/src/gd_wbmp.c:1.13 Fri Dec 21 22:38:39 2007 +++ gd/libgd/src/gd_wbmp.c Thu Jun 18 13:35:25 2009 @@ -170,6 +170,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromWBMPCtx(in); in->gd_free(in); return im; @@ -192,6 +193,7 @@ BGD_DECLARE(void) gdImageWBMP(gdImagePtr im, int fg, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageWBMPCtx(im, fg, out); out->gd_free(out); } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.14&r2=1.15&diff_format=u Index: gd/libgd/tests/CMakeLists.txt diff -u gd/libgd/tests/CMakeLists.txt:1.14 gd/libgd/tests/CMakeLists.txt:1.15 --- gd/libgd/tests/CMakeLists.txt:1.14 Tue May 5 17:28:21 2009 +++ gd/libgd/tests/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -22,7 +22,9 @@ SET(TESTS_DIRS gdtest + bmp freetype + gd gd2 gdimagearc gdimagecolorclosest @@ -44,11 +46,15 @@ gdimagesetpixel gdimagestringft gdimagestringftex + gdnewfilectx gdtiled gif jpeg png + tga + tiff xpm + wbmp ) IF (WIN32) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/Makefile.am?r1=1.8&r2=1.9&diff_format=u Index: gd/libgd/tests/Makefile.am diff -u gd/libgd/tests/Makefile.am:1.8 gd/libgd/tests/Makefile.am:1.9 --- gd/libgd/tests/Makefile.am:1.8 Tue May 5 17:28:21 2009 +++ gd/libgd/tests/Makefile.am Thu Jun 18 13:35:25 2009 @@ -2,7 +2,9 @@ AUTOMAKE_OPTIONS = foreign 1.7 SUBDIRS = gdtest \ + bmp \ freetype \ + gd \ gd2 \ gdimagearc \ gdimagecolorclosest \ @@ -23,11 +25,15 @@ gdimagesetpixel \ gdimagestringft \ gdimagestringftex \ + gdnewfilectx \ gdtiled \ gif \ jpeg \ png \ - xpm + tga \ + tiff \ + xpm \ + wbmp EXTRA_DIST = CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/CMakeLists.txt?r1=1.5&r2=1.6&diff_format=u Index: gd/libgd/tests/gd2/CMakeLists.txt diff -u gd/libgd/tests/gd2/CMakeLists.txt:1.5 gd/libgd/tests/gd2/CMakeLists.txt:1.6 --- gd/libgd/tests/gd2/CMakeLists.txt:1.5 Wed Jan 7 15:12:30 2009 +++ gd/libgd/tests/gd2/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES gd2_read gd2_empty_file + gd2_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/gd2/Makefile.am diff -u gd/libgd/tests/gd2/Makefile.am:1.2 gd/libgd/tests/gd2/Makefile.am:1.3 --- gd/libgd/tests/gd2/Makefile.am:1.2 Wed Mar 18 14:28:40 2009 +++ gd/libgd/tests/gd2/Makefile.am Thu Jun 18 13:35:25 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 +EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_null.c gd2_read.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/CMakeLists.txt?r1=1.6&r2=1.7&diff_format=u Index: gd/libgd/tests/gif/CMakeLists.txt diff -u gd/libgd/tests/gif/CMakeLists.txt:1.6 gd/libgd/tests/gif/CMakeLists.txt:1.7 --- gd/libgd/tests/gif/CMakeLists.txt:1.6 Wed Jan 7 15:12:31 2009 +++ gd/libgd/tests/gif/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + gif_null bug00005 bug00005_2 bug00006 http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/gif/Makefile.am diff -u gd/libgd/tests/gif/Makefile.am:1.2 gd/libgd/tests/gif/Makefile.am:1.3 --- gd/libgd/tests/gif/Makefile.am:1.2 Mon Nov 3 13:24:36 2008 +++ gd/libgd/tests/gif/Makefile.am Thu Jun 18 13:35:25 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt 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_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/tests/jpeg/CMakeLists.txt?r1=1.6&r2=1.7&diff_format=u Index: gd/libgd/tests/jpeg/CMakeLists.txt diff -u gd/libgd/tests/jpeg/CMakeLists.txt:1.6 gd/libgd/tests/jpeg/CMakeLists.txt:1.7 --- gd/libgd/tests/jpeg/CMakeLists.txt:1.6 Sun Mar 8 09:16:04 2009 +++ gd/libgd/tests/jpeg/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + jpeg_null jpeg_read jpeg_empty_file jpeg_resolution http://cvs.php.net/viewvc.cgi/gd/libgd/tests/jpeg/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/jpeg/Makefile.am diff -u gd/libgd/tests/jpeg/Makefile.am:1.2 gd/libgd/tests/jpeg/Makefile.am:1.3 --- gd/libgd/tests/jpeg/Makefile.am:1.2 Sun Mar 8 09:16:04 2009 +++ gd/libgd/tests/jpeg/Makefile.am Thu Jun 18 13:35:25 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_read.c jpeg_resolution.c +EXTRA_DIST = CMakeLists.txt jpeg_null.c conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_read.c jpeg_resolution.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/CMakeLists.txt?r1=1.8&r2=1.9&diff_format=u Index: gd/libgd/tests/png/CMakeLists.txt diff -u gd/libgd/tests/png/CMakeLists.txt:1.8 gd/libgd/tests/png/CMakeLists.txt:1.9 --- gd/libgd/tests/png/CMakeLists.txt:1.8 Fri Mar 13 20:18:24 2009 +++ gd/libgd/tests/png/CMakeLists.txt Thu Jun 18 13:35:26 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + png_null png_resolution bug00011 bug00033 http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/Makefile.am?r1=1.3&r2=1.4&diff_format=u Index: gd/libgd/tests/png/Makefile.am diff -u gd/libgd/tests/png/Makefile.am:1.3 gd/libgd/tests/png/Makefile.am:1.4 --- gd/libgd/tests/png/Makefile.am:1.3 Fri Mar 13 20:18:24 2009 +++ gd/libgd/tests/png/Makefile.am Thu Jun 18 13:35:26 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt 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 png_resolution.c +EXTRA_DIST = CMakeLists.txt 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 png_null.c png_resolution.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/CMakeLists.txt +++ gd/libgd/tests/bmp/CMakeLists.txt SET(TESTS_FILES bmp_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/Makefile.am +++ gd/libgd/tests/bmp/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt bmp_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/bmp_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/bmp_null.c +++ gd/libgd/tests/bmp/bmp_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromBmp(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageBmp(im, NULL, 0); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/gd/CMakeLists.txt +++ gd/libgd/tests/gd/CMakeLists.txt SET(TESTS_FILES gd_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/gd/Makefile.am +++ gd/libgd/tests/gd/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt gd_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/gd_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gd/gd_null.c +++ gd/libgd/tests/gd/gd_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGd(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGd(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/gd2_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gd2/gd2_null.c +++ gd/libgd/tests/gd2/gd2_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGd2(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGd2(im, NULL, 0, GD2_FMT_RAW); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/CMakeLists.txt +++ gd/libgd/tests/gdnewfilectx/CMakeLists.txt SET(TESTS_FILES gdnewfilectx_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/Makefile.am +++ gd/libgd/tests/gdnewfilectx/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt gdnewfilectx_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c +++ gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c #include <gd.h> int main() { if (gdNewFileCtx(NULL) != NULL) return 1; return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/gif_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gif/gif_null.c +++ gd/libgd/tests/gif/gif_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGif(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGif(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/jpeg/jpeg_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/jpeg/jpeg_null.c +++ gd/libgd/tests/jpeg/jpeg_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromJpeg(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageJpeg(im, NULL, 100); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/png_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/png/png_null.c +++ gd/libgd/tests/png/png_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromPng(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImagePng(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/tga/CMakeLists.txt +++ gd/libgd/tests/tga/CMakeLists.txt SET(TESTS_FILES tga_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/tga/Makefile.am +++ gd/libgd/tests/tga/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt tga_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/tga_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/tga/tga_null.c +++ gd/libgd/tests/tga/tga_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromTga(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/CMakeLists.txt +++ gd/libgd/tests/tiff/CMakeLists.txt SET(TESTS_FILES tiff_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/Makefile.am +++ gd/libgd/tests/tiff/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt tiff_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/tiff_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/tiff_null.c +++ gd/libgd/tests/tiff/tiff_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromTiff(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageTiff(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/CMakeLists.txt +++ gd/libgd/tests/wbmp/CMakeLists.txt SET(TESTS_FILES wbmp_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/Makefile.am +++ gd/libgd/tests/wbmp/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt wbmp_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/wbmp_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/wbmp_null.c +++ gd/libgd/tests/wbmp/wbmp_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromWBMP(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageWBMP(im, 0, NULL); /* noop safely */ return 0; }
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_bmp.c?r1=1.1&r2=1.2&diff_format=u Index: gd/libgd/src/gd_bmp.c diff -u gd/libgd/src/gd_bmp.c:1.1 gd/libgd/src/gd_bmp.c:1.2 --- gd/libgd/src/gd_bmp.c:1.1 Sat May 31 19:51:14 2008 +++ gd/libgd/src/gd_bmp.c Thu Jun 18 13:35:25 2009 @@ -12,7 +12,7 @@ ---------------------------------------------------------------------------- */ -/* $Id: gd_bmp.c,v 1.1 2008/05/31 19:51:14 scottmac Exp $ */ +/* $Id: gd_bmp.c,v 1.2 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -73,6 +73,7 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageBmpCtx(im, out, compression); out->gd_free(out); } @@ -402,6 +403,7 @@ { gdImagePtr im = 0; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromBmpCtx(in); in->gd_free(in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd.c?r1=1.14&r2=1.15&diff_format=u Index: gd/libgd/src/gd_gd.c diff -u gd/libgd/src/gd_gd.c:1.14 gd/libgd/src/gd_gd.c:1.15 --- gd/libgd/src/gd_gd.c:1.14 Tue Feb 24 07:59:08 2009 +++ gd/libgd/src/gd_gd.c Thu Jun 18 13:35:25 2009 @@ -171,6 +171,7 @@ gdIOCtx *in; in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGdCtx (in); in->gd_free (in); @@ -316,6 +317,7 @@ BGD_DECLARE(void) gdImageGd (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd (im, out); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gd2.c?r1=1.23&r2=1.24&diff_format=u Index: gd/libgd/src/gd_gd2.c diff -u gd/libgd/src/gd_gd2.c:1.23 gd/libgd/src/gd_gd2.c:1.24 --- gd/libgd/src/gd_gd2.c:1.23 Sun Nov 25 19:45:43 2007 +++ gd/libgd/src/gd_gd2.c Thu Jun 18 13:35:25 2009 @@ -282,6 +282,7 @@ gdIOCtx *in = gdNewFileCtx (inFile); gdImagePtr im; + if (in == NULL) return NULL; im = gdImageCreateFromGd2Ctx (in); in->gd_free (in); @@ -492,6 +493,7 @@ gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromGd2PartCtx (in, srcx, srcy, w, h); in->gd_free (in); @@ -1045,6 +1047,7 @@ BGD_DECLARE(void) gdImageGd2 (gdImagePtr im, FILE * outFile, int cs, int fmt) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; _gdImageGd2 (im, out, cs, fmt); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_in.c?r1=1.11&r2=1.12&diff_format=u Index: gd/libgd/src/gd_gif_in.c diff -u gd/libgd/src/gd_gif_in.c:1.11 gd/libgd/src/gd_gif_in.c:1.12 --- gd/libgd/src/gd_gif_in.c:1.11 Tue Oct 23 05:35:02 2007 +++ gd/libgd/src/gd_gif_in.c Thu Jun 18 13:35:25 2009 @@ -101,8 +101,9 @@ BGD_DECLARE(gdImagePtr) gdImageCreateFromGif(FILE *fdFile) { gdIOCtx *fd = gdNewFileCtx(fdFile); - gdImagePtr im = 0; + gdImagePtr im; + if (fd == NULL) return NULL; im = gdImageCreateFromGifCtx(fd); fd->gd_free(fd); http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_gif_out.c?r1=1.9&r2=1.10&diff_format=u Index: gd/libgd/src/gd_gif_out.c diff -u gd/libgd/src/gd_gif_out.c:1.9 gd/libgd/src/gd_gif_out.c:1.10 --- gd/libgd/src/gd_gif_out.c:1.9 Mon Nov 3 13:24:36 2008 +++ gd/libgd/src/gd_gif_out.c Thu Jun 18 13:35:25 2009 @@ -102,6 +102,7 @@ BGD_DECLARE(void) gdImageGif(gdImagePtr im, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifCtx(im, out); out->gd_free(out); } @@ -150,6 +151,7 @@ BGD_DECLARE(void) gdImageGifAnimBegin(gdImagePtr im, FILE *outFile, int GlobalCM, int Loops) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimBeginCtx(im, out, GlobalCM, Loops); out->gd_free(out); } @@ -231,6 +233,7 @@ BGD_DECLARE(void) gdImageGifAnimAdd(gdImagePtr im, FILE *outFile, int LocalCM, int LeftOfs, int TopOfs, int Delay, int Disposal, gdImagePtr previm) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimAddCtx(im, out, LocalCM, LeftOfs, TopOfs, Delay, Disposal, previm); out->gd_free(out); } @@ -453,6 +456,7 @@ putc(';', outFile); #else gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageGifAnimEndCtx(out); out->gd_free(out); #endif http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_io_file.c?r1=1.11&r2=1.12&diff_format=u Index: gd/libgd/src/gd_io_file.c diff -u gd/libgd/src/gd_io_file.c:1.11 gd/libgd/src/gd_io_file.c:1.12 --- gd/libgd/src/gd_io_file.c:1.11 Fri Dec 21 22:02:50 2007 +++ gd/libgd/src/gd_io_file.c Thu Jun 18 13:35:25 2009 @@ -54,6 +54,7 @@ { fileIOCtx *ctx; + if (f == NULL) return NULL; ctx = (fileIOCtx *)gdMalloc(sizeof(fileIOCtx)); if(ctx == NULL) { return NULL; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_jpeg.c?r1=1.25&r2=1.26&diff_format=u Index: gd/libgd/src/gd_jpeg.c diff -u gd/libgd/src/gd_jpeg.c:1.25 gd/libgd/src/gd_jpeg.c:1.26 --- gd/libgd/src/gd_jpeg.c:1.25 Sun Mar 8 09:16:04 2009 +++ gd/libgd/src/gd_jpeg.c Thu Jun 18 13:35:25 2009 @@ -95,6 +95,7 @@ BGD_DECLARE(void) gdImageJpeg(gdImagePtr im, FILE *outFile, int quality) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageJpegCtx(im, out, quality); out->gd_free(out); } @@ -265,6 +266,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromJpegCtx(in); in->gd_free(in); return im; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_png.c?r1=1.32&r2=1.33&diff_format=u Index: gd/libgd/src/gd_png.c diff -u gd/libgd/src/gd_png.c:1.32 gd/libgd/src/gd_png.c:1.33 --- gd/libgd/src/gd_png.c:1.32 Tue Mar 31 16:17:23 2009 +++ gd/libgd/src/gd_png.c Thu Jun 18 13:35:25 2009 @@ -1,4 +1,4 @@ -/* $Id: gd_png.c,v 1.32 2009/03/31 16:17:23 tabe Exp $ */ +/* $Id: gd_png.c,v 1.33 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -101,6 +101,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx (inFile); + if (in == NULL) return NULL; im = gdImageCreateFromPngCtx (in); in->gd_free (in); return im; @@ -467,6 +468,7 @@ BGD_DECLARE(void) gdImagePngEx (gdImagePtr im, FILE * outFile, int level) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, level); out->gd_free (out); } @@ -474,6 +476,7 @@ BGD_DECLARE(void) gdImagePng (gdImagePtr im, FILE * outFile) { gdIOCtx *out = gdNewFileCtx (outFile); + if (out == NULL) return; gdImagePngCtxEx (im, out, -1); out->gd_free (out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tga.c?r1=1.12&r2=1.13&diff_format=u Index: gd/libgd/src/gd_tga.c diff -u gd/libgd/src/gd_tga.c:1.12 gd/libgd/src/gd_tga.c:1.13 --- gd/libgd/src/gd_tga.c:1.12 Wed Jul 30 01:53:13 2008 +++ gd/libgd/src/gd_tga.c Thu Jun 18 13:35:25 2009 @@ -16,6 +16,7 @@ { gdImagePtr image; gdIOCtx* in = gdNewFileCtx(fp); + if (in == NULL) return NULL; image = gdImageCreateFromTgaCtx(in); in->gd_free( in ); return image; http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_tiff.c?r1=1.21&r2=1.22&diff_format=u Index: gd/libgd/src/gd_tiff.c diff -u gd/libgd/src/gd_tiff.c:1.21 gd/libgd/src/gd_tiff.c:1.22 --- gd/libgd/src/gd_tiff.c:1.21 Wed Mar 4 11:55:18 2009 +++ gd/libgd/src/gd_tiff.c Thu Jun 18 13:35:25 2009 @@ -27,7 +27,7 @@ ---------------------------------------------------------------------------- */ -/* $Id: gd_tiff.c,v 1.21 2009/03/04 11:55:18 tabe Exp $ */ +/* $Id: gd_tiff.c,v 1.22 2009/06/18 13:35:25 tabe Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -981,6 +981,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromTiffCtx(in); in->gd_free(in); return im; @@ -1001,6 +1002,7 @@ BGD_DECLARE(void) gdImageTiff(gdImagePtr im, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageTiffCtx(im, out); /* what's an fg again? */ out->gd_free(out); } http://cvs.php.net/viewvc.cgi/gd/libgd/src/gd_wbmp.c?r1=1.13&r2=1.14&diff_format=u Index: gd/libgd/src/gd_wbmp.c diff -u gd/libgd/src/gd_wbmp.c:1.13 gd/libgd/src/gd_wbmp.c:1.14 --- gd/libgd/src/gd_wbmp.c:1.13 Fri Dec 21 22:38:39 2007 +++ gd/libgd/src/gd_wbmp.c Thu Jun 18 13:35:25 2009 @@ -170,6 +170,7 @@ { gdImagePtr im; gdIOCtx *in = gdNewFileCtx(inFile); + if (in == NULL) return NULL; im = gdImageCreateFromWBMPCtx(in); in->gd_free(in); return im; @@ -192,6 +193,7 @@ BGD_DECLARE(void) gdImageWBMP(gdImagePtr im, int fg, FILE *outFile) { gdIOCtx *out = gdNewFileCtx(outFile); + if (out == NULL) return; gdImageWBMPCtx(im, fg, out); out->gd_free(out); } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.14&r2=1.15&diff_format=u Index: gd/libgd/tests/CMakeLists.txt diff -u gd/libgd/tests/CMakeLists.txt:1.14 gd/libgd/tests/CMakeLists.txt:1.15 --- gd/libgd/tests/CMakeLists.txt:1.14 Tue May 5 17:28:21 2009 +++ gd/libgd/tests/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -22,7 +22,9 @@ SET(TESTS_DIRS gdtest + bmp freetype + gd gd2 gdimagearc gdimagecolorclosest @@ -44,11 +46,15 @@ gdimagesetpixel gdimagestringft gdimagestringftex + gdnewfilectx gdtiled gif jpeg png + tga + tiff xpm + wbmp ) IF (WIN32) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/Makefile.am?r1=1.8&r2=1.9&diff_format=u Index: gd/libgd/tests/Makefile.am diff -u gd/libgd/tests/Makefile.am:1.8 gd/libgd/tests/Makefile.am:1.9 --- gd/libgd/tests/Makefile.am:1.8 Tue May 5 17:28:21 2009 +++ gd/libgd/tests/Makefile.am Thu Jun 18 13:35:25 2009 @@ -2,7 +2,9 @@ AUTOMAKE_OPTIONS = foreign 1.7 SUBDIRS = gdtest \ + bmp \ freetype \ + gd \ gd2 \ gdimagearc \ gdimagecolorclosest \ @@ -23,11 +25,15 @@ gdimagesetpixel \ gdimagestringft \ gdimagestringftex \ + gdnewfilectx \ gdtiled \ gif \ jpeg \ png \ - xpm + tga \ + tiff \ + xpm \ + wbmp EXTRA_DIST = CMakeLists.txt http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/CMakeLists.txt?r1=1.5&r2=1.6&diff_format=u Index: gd/libgd/tests/gd2/CMakeLists.txt diff -u gd/libgd/tests/gd2/CMakeLists.txt:1.5 gd/libgd/tests/gd2/CMakeLists.txt:1.6 --- gd/libgd/tests/gd2/CMakeLists.txt:1.5 Wed Jan 7 15:12:30 2009 +++ gd/libgd/tests/gd2/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -2,6 +2,7 @@ SET(TESTS_FILES gd2_read gd2_empty_file + gd2_null ) FOREACH(test_name ${TESTS_FILES}) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/gd2/Makefile.am diff -u gd/libgd/tests/gd2/Makefile.am:1.2 gd/libgd/tests/gd2/Makefile.am:1.3 --- gd/libgd/tests/gd2/Makefile.am:1.2 Wed Mar 18 14:28:40 2009 +++ gd/libgd/tests/gd2/Makefile.am Thu Jun 18 13:35:25 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 +EXTRA_DIST = CMakeLists.txt conv_gd2_exp.gd2 conv_test_exp.png conv_test.gd2 empty.gd2 gd2_empty_file.c gd2_null.c gd2_read.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/CMakeLists.txt?r1=1.6&r2=1.7&diff_format=u Index: gd/libgd/tests/gif/CMakeLists.txt diff -u gd/libgd/tests/gif/CMakeLists.txt:1.6 gd/libgd/tests/gif/CMakeLists.txt:1.7 --- gd/libgd/tests/gif/CMakeLists.txt:1.6 Wed Jan 7 15:12:31 2009 +++ gd/libgd/tests/gif/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + gif_null bug00005 bug00005_2 bug00006 http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/gif/Makefile.am diff -u gd/libgd/tests/gif/Makefile.am:1.2 gd/libgd/tests/gif/Makefile.am:1.3 --- gd/libgd/tests/gif/Makefile.am:1.2 Mon Nov 3 13:24:36 2008 +++ gd/libgd/tests/gif/Makefile.am Thu Jun 18 13:35:25 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt 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_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/tests/jpeg/CMakeLists.txt?r1=1.6&r2=1.7&diff_format=u Index: gd/libgd/tests/jpeg/CMakeLists.txt diff -u gd/libgd/tests/jpeg/CMakeLists.txt:1.6 gd/libgd/tests/jpeg/CMakeLists.txt:1.7 --- gd/libgd/tests/jpeg/CMakeLists.txt:1.6 Sun Mar 8 09:16:04 2009 +++ gd/libgd/tests/jpeg/CMakeLists.txt Thu Jun 18 13:35:25 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + jpeg_null jpeg_read jpeg_empty_file jpeg_resolution http://cvs.php.net/viewvc.cgi/gd/libgd/tests/jpeg/Makefile.am?r1=1.2&r2=1.3&diff_format=u Index: gd/libgd/tests/jpeg/Makefile.am diff -u gd/libgd/tests/jpeg/Makefile.am:1.2 gd/libgd/tests/jpeg/Makefile.am:1.3 --- gd/libgd/tests/jpeg/Makefile.am:1.2 Sun Mar 8 09:16:04 2009 +++ gd/libgd/tests/jpeg/Makefile.am Thu Jun 18 13:35:25 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_read.c jpeg_resolution.c +EXTRA_DIST = CMakeLists.txt jpeg_null.c conv_test_exp.png conv_test.jpeg empty.jpeg jpeg_empty_file.c jpeg_read.c jpeg_resolution.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/CMakeLists.txt?r1=1.8&r2=1.9&diff_format=u Index: gd/libgd/tests/png/CMakeLists.txt diff -u gd/libgd/tests/png/CMakeLists.txt:1.8 gd/libgd/tests/png/CMakeLists.txt:1.9 --- gd/libgd/tests/png/CMakeLists.txt:1.8 Fri Mar 13 20:18:24 2009 +++ gd/libgd/tests/png/CMakeLists.txt Thu Jun 18 13:35:26 2009 @@ -1,5 +1,6 @@ SET(TESTS_FILES + png_null png_resolution bug00011 bug00033 http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/Makefile.am?r1=1.3&r2=1.4&diff_format=u Index: gd/libgd/tests/png/Makefile.am diff -u gd/libgd/tests/png/Makefile.am:1.3 gd/libgd/tests/png/Makefile.am:1.4 --- gd/libgd/tests/png/Makefile.am:1.3 Fri Mar 13 20:18:24 2009 +++ gd/libgd/tests/png/Makefile.am Thu Jun 18 13:35:26 2009 @@ -1,3 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -EXTRA_DIST = CMakeLists.txt 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 png_resolution.c +EXTRA_DIST = CMakeLists.txt 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 png_null.c png_resolution.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/CMakeLists.txt +++ gd/libgd/tests/bmp/CMakeLists.txt SET(TESTS_FILES bmp_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/Makefile.am +++ gd/libgd/tests/bmp/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt bmp_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/bmp/bmp_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/bmp/bmp_null.c +++ gd/libgd/tests/bmp/bmp_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromBmp(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageBmp(im, NULL, 0); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/gd/CMakeLists.txt +++ gd/libgd/tests/gd/CMakeLists.txt SET(TESTS_FILES gd_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/gd/Makefile.am +++ gd/libgd/tests/gd/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt gd_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd/gd_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gd/gd_null.c +++ gd/libgd/tests/gd/gd_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGd(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGd(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/gd2_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gd2/gd2_null.c +++ gd/libgd/tests/gd2/gd2_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGd2(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGd2(im, NULL, 0, GD2_FMT_RAW); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/CMakeLists.txt +++ gd/libgd/tests/gdnewfilectx/CMakeLists.txt SET(TESTS_FILES gdnewfilectx_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/Makefile.am +++ gd/libgd/tests/gdnewfilectx/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt gdnewfilectx_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c +++ gd/libgd/tests/gdnewfilectx/gdnewfilectx_null.c #include <gd.h> int main() { if (gdNewFileCtx(NULL) != NULL) return 1; return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/gif_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/gif/gif_null.c +++ gd/libgd/tests/gif/gif_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromGif(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageGif(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/jpeg/jpeg_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/jpeg/jpeg_null.c +++ gd/libgd/tests/jpeg/jpeg_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromJpeg(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageJpeg(im, NULL, 100); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/png_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/png/png_null.c +++ gd/libgd/tests/png/png_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromPng(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImagePng(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/tga/CMakeLists.txt +++ gd/libgd/tests/tga/CMakeLists.txt SET(TESTS_FILES tga_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/tga/Makefile.am +++ gd/libgd/tests/tga/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt tga_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tga/tga_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/tga/tga_null.c +++ gd/libgd/tests/tga/tga_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromTga(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/CMakeLists.txt +++ gd/libgd/tests/tiff/CMakeLists.txt SET(TESTS_FILES tiff_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/Makefile.am +++ gd/libgd/tests/tiff/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt tiff_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/tiff/tiff_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/tiff/tiff_null.c +++ gd/libgd/tests/tiff/tiff_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromTiff(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageTiff(im, NULL); /* noop safely */ return 0; } http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/CMakeLists.txt?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/CMakeLists.txt +++ gd/libgd/tests/wbmp/CMakeLists.txt SET(TESTS_FILES wbmp_null ) FOREACH(test_name ${TESTS_FILES}) add_executable(${test_name} "${test_name}.c") target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK}) get_target_property(test_path ${test_name} LOCATION) ADD_TEST(${test_name} ${test_path}) ENDFOREACH(test_name) http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/Makefile.am?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/Makefile.am +++ gd/libgd/tests/wbmp/Makefile.am ## Process this file with automake to produce Makefile.in -*-Makefile-*- EXTRA_DIST = CMakeLists.txt wbmp_null.c http://cvs.php.net/viewvc.cgi/gd/libgd/tests/wbmp/wbmp_null.c?view=markup&rev=1.1 Index: gd/libgd/tests/wbmp/wbmp_null.c +++ gd/libgd/tests/wbmp/wbmp_null.c #include <gd.h> int main() { gdImagePtr im; im = gdImageCreateFromWBMP(NULL); if (im != NULL) { gdImageDestroy(im); return 1; } gdImageWBMP(im, 0, NULL); /* noop safely */ return 0; }