[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
kalle Fri Jun 19 22:15:28 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: MFH: Fix memleak http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.42r2=1.312.2.20.2.32.2.43diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.42 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.43 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.42Wed May 27 08:18:23 2009 +++ php-src/ext/gd/gd.c Fri Jun 19 22:15:28 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.42 2009/05/27 08:18:23 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.43 2009/06/19 22:15:28 kalle Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2010,7 +2010,6 @@ pPrintWindow(window, memDC, (UINT) client_area); } else { php_error_docref(NULL TSRMLS_CC, E_WARNING, Windows API too old); - RETURN_FALSE; goto clean; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue May 26 13:35:59 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - enable filter constants http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.37r2=1.312.2.20.2.32.2.38diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.37 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.38 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.37Tue May 26 12:50:40 2009 +++ php-src/ext/gd/gd.c Tue May 26 13:35:59 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.37 2009/05/26 12:50:40 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.38 2009/05/26 13:35:59 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1175,6 +1175,9 @@ REGISTER_LONG_CONSTANT(IMG_EFFECT_NORMAL, gdEffectNormal, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_EFFECT_OVERLAY, gdEffectOverlay, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(GD_BUNDLED, 1, CONST_CS | CONST_PERSISTENT); +#else + REGISTER_LONG_CONSTANT(GD_BUNDLED, 0, CONST_CS | CONST_PERSISTENT); +#endif /* Section Filters */ REGISTER_LONG_CONSTANT(IMG_FILTER_NEGATE, IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); @@ -1190,9 +1193,6 @@ REGISTER_LONG_CONSTANT(IMG_FILTER_SMOOTH, IMAGE_FILTER_SMOOTH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_FILTER_PIXELATE, IMAGE_FILTER_PIXELATE, CONST_CS | CONST_PERSISTENT); /* End Section Filters */ -#else - REGISTER_LONG_CONSTANT(GD_BUNDLED, 0, CONST_CS | CONST_PERSISTENT); -#endif #ifdef GD_VERSION_STRING REGISTER_STRING_CONSTANT(GD_VERSION, GD_VERSION_STRING, CONST_CS | CONST_PERSISTENT); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue May 26 13:57:08 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - ws http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.38r2=1.312.2.20.2.32.2.39diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.38 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.39 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.38Tue May 26 13:35:59 2009 +++ php-src/ext/gd/gd.c Tue May 26 13:57:07 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.38 2009/05/26 13:35:59 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.39 2009/05/26 13:57:07 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1080,7 +1080,7 @@ PHP_INI_ENTRY(gd.jpeg_ignore_warning, 0, PHP_INI_ALL, NULL) PHP_INI_END() /* }}} */ - + /* {{{ php_free_gd_image */ static void php_free_gd_image(zend_rsrc_list_entry *rsrc TSRMLS_DC) @@ -1103,7 +1103,6 @@ } /* }}} */ - /* {{{ PHP_MSHUTDOWN_FUNCTION */ #if HAVE_LIBT1 || HAVE_GD_FONTMUTEX @@ -1141,7 +1140,7 @@ #endif REGISTER_INI_ENTRIES(); - + REGISTER_LONG_CONSTANT(IMG_GIF, 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_JPG, 2, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_JPEG, 2, CONST_CS | CONST_PERSISTENT); @@ -1162,6 +1161,7 @@ REGISTER_LONG_CONSTANT(IMG_ARC_CHORD, gdChord, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_NOFILL, gdNoFill, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_EDGED, gdEdged, CONST_CS | CONST_PERSISTENT); + /* GD2 image format types */ #ifdef GD2_FMT_RAW REGISTER_LONG_CONSTANT(IMG_GD2_RAW, GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT); @@ -1208,19 +1208,20 @@ #ifdef HAVE_GD_PNG -/* - * cannot include #include png.h - * /usr/include/pngconf.h:310:2: error: #error png.h already includes setjmp.h with some additional fixup. - * as error, use the values for now... - */ - REGISTER_LONG_CONSTANT(PNG_NO_FILTER, 0x00, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_FILTER_NONE, 0x08, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_FILTER_SUB,0x10, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_FILTER_UP, 0x20, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_FILTER_AVG,0x40, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_FILTER_PAETH, 0x80, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(PNG_ALL_FILTERS, 0x08 | 0x10 | 0x20 | 0x40 | 0x80, CONST_CS | CONST_PERSISTENT); + /* +* cannot include #include png.h +* /usr/include/pngconf.h:310:2: error: #error png.h already includes setjmp.h with some additional fixup. +* as error, use the values for now... +*/ + REGISTER_LONG_CONSTANT(PNG_NO_FILTER, 0x00, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_FILTER_NONE, 0x08, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_FILTER_SUB,0x10, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_FILTER_UP, 0x20, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_FILTER_AVG,0x40, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_FILTER_PAETH, 0x80, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(PNG_ALL_FILTERS, 0x08 | 0x10 | 0x20 | 0x40 | 0x80, CONST_CS | CONST_PERSISTENT); #endif + return SUCCESS; } /* }}} */ @@ -1263,6 +1264,7 @@ php_info_print_table_row(2, FreeType Linkage, with freetype); { char tmp[256]; + #ifdef FREETYPE_PATCH snprintf(tmp, sizeof(tmp), %d.%d.%d, FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH); #elif defined(FREETYPE_MAJOR) @@ -1798,7 +1800,6 @@ } ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); - gdImageAlphaBlending(im, blend); RETURN_TRUE; @@ -1818,7 +1819,6 @@ } ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); - gdImageSaveAlpha(im, save); RETURN_TRUE; @@ -1839,7 +1839,6 @@ } ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); - gdImageAlphaBlending(im, effect); RETURN_TRUE; @@ -1861,12 +1860,10 @@ } ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); - ct = gdImageColorAllocateAlpha(im, red, green, blue, alpha); if (ct 0) { RETURN_FALSE; } - RETURN_LONG((long)ct); } /* }}} */ @@ -3176,9 +3173,7 @@ } ZEND_FETCH_RESOURCE(im, gdImagePtr, IM, -1, Image, le_gd); - gdImageSetPixel(im, x, y, col); - RETURN_TRUE; } /* }}} */ @@ -3222,7 +3217,6 @@ }
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue Apr 7 12:45:27 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - ws http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.35r2=1.312.2.20.2.32.2.36diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.35 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.36 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.35Tue Apr 7 09:26:22 2009 +++ php-src/ext/gd/gd.c Tue Apr 7 12:45:26 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.35 2009/04/07 09:26:22 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.36 2009/04/07 12:45:26 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -48,9 +48,9 @@ #ifdef PHP_WIN32 # include io.h # include fcntl.h -#include windows.h -#include Winuser.h -#include Wingdi.h +# include windows.h +# include Winuser.h +# include Wingdi.h #endif #if HAVE_LIBGD -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
felipe Thu Mar 26 00:43:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - Missing changes related to #47757 for this branch http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.33r2=1.312.2.20.2.32.2.34diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.33 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.34 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.33Tue Mar 24 12:48:52 2009 +++ php-src/ext/gd/gd.c Thu Mar 26 00:43:45 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.33 2009/03/24 12:48:52 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.34 2009/03/26 00:43:45 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1360,9 +1360,9 @@ add_assoc_bool(return_value, GIF Create Support, 0); #endif #ifdef HAVE_GD_JPG - add_assoc_bool(return_value, JPG Support, 1); + add_assoc_bool(return_value, JPEG Support, 1); #else - add_assoc_bool(return_value, JPG Support, 0); + add_assoc_bool(return_value, JPEG Support, 0); #endif #ifdef HAVE_GD_PNG add_assoc_bool(return_value, PNG Support, 1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue Mar 24 09:41:43 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - #47757 rename JPG to JPEG in phpinfo http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.31r2=1.312.2.20.2.32.2.32diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.31 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.32 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.31Sat Jan 31 15:27:52 2009 +++ php-src/ext/gd/gd.c Tue Mar 24 09:41:42 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.31 2009/01/31 15:27:52 kalle Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.32 2009/03/24 09:41:42 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1295,7 +1295,7 @@ { char tmp[12]; snprintf(tmp, sizeof(tmp), %d, gdJpegGetVersionInt()); - php_info_print_table_row(2, JPG Support, enabled); + php_info_print_table_row(2, JEPG Support, enabled); php_info_print_table_row(2, libJPEG Version, tmp); } #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue Mar 24 12:48:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - GEPJ.. (thx to Derick for the head!) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.32r2=1.312.2.20.2.32.2.33diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.32 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.33 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.32Tue Mar 24 09:41:42 2009 +++ php-src/ext/gd/gd.c Tue Mar 24 12:48:52 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.32 2009/03/24 09:41:42 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.33 2009/03/24 12:48:52 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1295,7 +1295,7 @@ { char tmp[12]; snprintf(tmp, sizeof(tmp), %d, gdJpegGetVersionInt()); - php_info_print_table_row(2, JEPG Support, enabled); + php_info_print_table_row(2, JPEG Support, enabled); php_info_print_table_row(2, libJPEG Version, tmp); } #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
2009/3/24 Pierre-Alain Joye paj...@php.net: - GEPJ.. (thx to Derick for the head!) +up and sigh. -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
kalle Sat Jan 31 15:27:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: MFH: Fix arginfo for imagefilter() http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.30r2=1.312.2.20.2.32.2.31diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.30 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.31 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.30Mon Jan 19 16:35:58 2009 +++ php-src/ext/gd/gd.c Sat Jan 31 15:27:52 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.30 2009/01/19 16:35:58 tabe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.31 2009/01/31 15:27:52 kalle Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -859,6 +859,7 @@ ZEND_ARG_INFO(0, arg1) ZEND_ARG_INFO(0, arg2) ZEND_ARG_INFO(0, arg3) + ZEND_ARG_INFO(0, arg4) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_imageconvolution, 0) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
tabeMon Jan 19 16:35:58 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: MFH: bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.29r2=1.312.2.20.2.32.2.30diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.29 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.30 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.29Thu Jan 15 07:57:11 2009 +++ php-src/ext/gd/gd.c Mon Jan 19 16:35:58 2009 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.29 2009/01/15 07:57:11 kalle Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.30 2009/01/19 16:35:58 tabe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -143,7 +143,7 @@ #define IMAGE_FILTER_SMOOTH 10 #define IMAGE_FILTER_PIXELATE 11 #define IMAGE_FILTER_MAX11 -#define IMAGE_FILTER_MAX_ARGS 5 +#define IMAGE_FILTER_MAX_ARGS 6 static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS); static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS); static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS); @@ -4966,7 +4966,7 @@ php_image_filter_pixelate }; - if (ZEND_NUM_ARGS() 2 || ZEND_NUM_ARGS() 6) { + if (ZEND_NUM_ARGS() 2 || ZEND_NUM_ARGS() IMAGE_FILTER_MAX_ARGS) { WRONG_PARAM_COUNT; } else if (zend_parse_parameters(2 TSRMLS_CC, rl, tmp, filtertype) == FAILURE) { return; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c /ext/gd/libgd gd.h gd_jpeg.c gd_png.c
pajoye Thu Nov 6 10:14:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c /php-src/ext/gd/libgd gd.h gd_jpeg.c gd_png.c Log: - fix build on linux (static) - add gd[Format]Version[Int|String] first methods to work around the png header issues http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.22r2=1.312.2.20.2.32.2.23diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22Tue Nov 4 20:25:45 2008 +++ php-src/ext/gd/gd.c Thu Nov 6 10:14:37 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.22 2008/11/04 20:25:45 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.23 2008/11/06 10:14:37 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -29,15 +29,6 @@ #include config.h #endif -#ifdef HAVE_GD_PNG -/* needs to be first */ -#include png.h -#endif -#ifdef HAVE_GD_JPG -/* needs to be first */ -#include jpeglib.h -#endif - #include php.h #include php_ini.h #include ext/standard/head.h @@ -1395,15 +1386,16 @@ #endif #ifdef HAVE_GD_JPG { - char tmp[256]; - snprintf(tmp, sizeof(tmp), %d, JPEG_LIB_VERSION); + char tmp[12]; + snprintf(tmp, sizeof(tmp), %d, gdJpegGetVersionInt()); php_info_print_table_row(2, JPG Support, enabled); - php_info_print_table_row(2, libJPEG Version, tmp); + php_info_print_table_row(2, libPNG Version, tmp); } #endif + #ifdef HAVE_GD_PNG php_info_print_table_row(2, PNG Support, enabled); - php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING); + php_info_print_table_row(2, libPNG Version, gdPngGetVersionString()); #endif #ifdef HAVE_GD_WBMP php_info_print_table_row(2, WBMP Support, enabled); http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.26.2.3.2.6r2=1.26.2.3.2.6.2.1diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6 php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6.2.1 --- php-src/ext/gd/libgd/gd.h:1.26.2.3.2.6 Tue Sep 11 23:34:25 2007 +++ php-src/ext/gd/libgd/gd.h Thu Nov 6 10:14:37 2008 @@ -250,6 +250,8 @@ gdImagePtr gdImageCreateFromJpeg(FILE *infile, int ignore_warning); gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile, int ignore_warning); +int gdJpegGetVersionInt(); +const char * gdPngGetVersionString(); /* A custom data source. */ /* The source function must return -1 on error, otherwise the number of bytes fetched. 0 is EOF, not an error! */ http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_jpeg.c?r1=1.18.4.2r2=1.18.4.2.4.1diff_format=u Index: php-src/ext/gd/libgd/gd_jpeg.c diff -u php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2 php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2.4.1 --- php-src/ext/gd/libgd/gd_jpeg.c:1.18.4.2 Sun Feb 5 15:53:58 2006 +++ php-src/ext/gd/libgd/gd_jpeg.c Thu Nov 6 10:14:37 2008 @@ -102,6 +102,11 @@ exit (99); } +int gdJpegGetVersionInt() +{ + return JPEG_LIB_VERSION; +} + /* * Write IM to OUTFILE as a JFIF-formatted JPEG image, using quality * QUALITY. If QUALITY is in the range 0-100, increasing values http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.17.4.2.2.5.2.1r2=1.17.4.2.2.5.2.2diff_format=u Index: php-src/ext/gd/libgd/gd_png.c diff -u php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.1 php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.2 --- php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5.2.1 Thu Jul 31 09:23:18 2008 +++ php-src/ext/gd/libgd/gd_png.c Thu Nov 6 10:14:37 2008 @@ -36,6 +36,11 @@ ---*/ +const char * gdPngGetVersionString() +{ + return PNG_LIBPNG_VER_STRING; +} + #ifndef PNG_SETJMP_NOT_SUPPORTED typedef struct _jmpbuf_wrapper { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Thu Nov 6 10:17:44 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - typo http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.23r2=1.312.2.20.2.32.2.24diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.24 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.23Thu Nov 6 10:14:37 2008 +++ php-src/ext/gd/gd.c Thu Nov 6 10:17:44 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.23 2008/11/06 10:14:37 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.24 2008/11/06 10:17:44 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1389,7 +1389,7 @@ char tmp[12]; snprintf(tmp, sizeof(tmp), %d, gdJpegGetVersionInt()); php_info_print_table_row(2, JPG Support, enabled); - php_info_print_table_row(2, libPNG Version, tmp); + php_info_print_table_row(2, libJPEG Version, tmp); } #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
On Tue, 4 Nov 2008, Pierre-Alain Joye wrote: pajoyeTue Nov 4 20:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: add png and jpeg version info This patch breaks the build for me with: /home/derick/dev/php/php-5.3dev/ext/gd/gd.c: In function 'zm_info_gd': /home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: 'JPEG_LIB_VERSION' undeclared (first use in this function) /home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: (Each undeclared identifier is reported only once /home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1399: error: for each function it appears in.) /home/derick/dev/php/php-5.3dev/ext/gd/gd.c:1406: error: 'PNG_LIBPNG_VER_STRING' undeclared (first use in this function) regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
On Wed, Nov 5, 2008 at 12:45 PM, Derick Rethans [EMAIL PROTECTED] wrote: On Tue, 4 Nov 2008, Pierre-Alain Joye wrote: pajoyeTue Nov 4 20:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: add png and jpeg version info This patch breaks the build for me with: Yes, Tony already pointed it out. I will commit the fix asap (problem is when you build it statically). Thanks for the head up, Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Tue Nov 4 20:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: add png and jpeg version info http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.21r2=1.312.2.20.2.32.2.22diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.22 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.21Sun Nov 2 21:19:31 2008 +++ php-src/ext/gd/gd.c Tue Nov 4 20:25:45 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.21 2008/11/02 21:19:31 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.22 2008/11/04 20:25:45 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -33,6 +33,10 @@ /* needs to be first */ #include png.h #endif +#ifdef HAVE_GD_JPG +/* needs to be first */ +#include jpeglib.h +#endif #include php.h #include php_ini.h @@ -1390,10 +1394,16 @@ php_info_print_table_row(2, GIF Create Support, enabled); #endif #ifdef HAVE_GD_JPG - php_info_print_table_row(2, JPG Support, enabled); + { + char tmp[256]; + snprintf(tmp, sizeof(tmp), %d, JPEG_LIB_VERSION); + php_info_print_table_row(2, JPG Support, enabled); + php_info_print_table_row(2, libJPEG Version, tmp); + } #endif #ifdef HAVE_GD_PNG php_info_print_table_row(2, PNG Support, enabled); + php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING); #endif #ifdef HAVE_GD_WBMP php_info_print_table_row(2, WBMP Support, enabled); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
On 04.11.2008 23:25, Pierre-Alain Joye wrote: pajoyeTue Nov 4 20:25:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: add png and jpeg version info + php_info_print_table_row(2, libPNG Version, PNG_LIBPNG_VER_STRING); This breaks the build. /local/qa/5_3/ext/gd/gd.c: In function 'zm_info_gd': /local/qa/5_3/ext/gd/gd.c:1406: error: 'PNG_LIBPNG_VER_STRING' undeclared (first use in this function) /local/qa/5_3/ext/gd/gd.c:1406: error: (Each undeclared identifier is reported only once /local/qa/5_3/ext/gd/gd.c:1406: error: for each function it appears in.) make: *** [ext/gd/gd.lo] Error 1 png.h is NOT really included in gd.c because HAVE_GD_PNG gets defined only after #include php.h (I'm building it statically, so there's not config.h). Moving png.h and jpeglib.h a few lines down seems to help. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
pajoye Fri Aug 29 11:09:28 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - MFH: fix warning http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.16r2=1.312.2.20.2.32.2.17diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.16 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.17 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.16Mon Aug 4 23:48:09 2008 +++ php-src/ext/gd/gd.c Fri Aug 29 11:09:28 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.16 2008/08/04 23:48:09 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.17 2008/08/29 11:09:28 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -43,6 +43,7 @@ #include ext/standard/info.h #include php_open_temporary_file.h + #if HAVE_SYS_WAIT_H # include sys/wait.h #endif @@ -73,6 +74,8 @@ #include gdfontmb.h /* 3 Medium bold font */ #include gdfontl.h /* 4 Large font */ #include gdfontg.h /* 5 Giant font */ +#include gdhelpers.h + #ifdef HAVE_GD_WBMP #include libgd/wbmp.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c gd_ctx.c
felipe Mon Aug 4 18:23:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c gd_ctx.c Log: - MFH: Added new parameter parsing API (part II) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.14r2=1.312.2.20.2.32.2.15diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.14 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.15 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.14Fri Jul 18 07:39:53 2008 +++ php-src/ext/gd/gd.c Mon Aug 4 18:23:33 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.14 2008/07/18 07:39:53 tony2001 Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.15 2008/08/04 18:23:33 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2497,35 +2497,30 @@ */ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)()) { - zval **file, **srcx, **srcy, **width, **height; + char *file; + int file_len; + long srcx, srcy, width, height; gdImagePtr im = NULL; - char *fn=NULL; php_stream *stream; FILE * fp = NULL; - int argc=ZEND_NUM_ARGS(); #ifdef HAVE_GD_JPG long ignore_warning; #endif - - if ((image_type == PHP_GDIMG_TYPE_GD2PART argc != 5) || - (image_type != PHP_GDIMG_TYPE_GD2PART argc != 1) || - zend_get_parameters_ex(argc, file, srcx, srcy, width, height) == FAILURE) { - ZEND_WRONG_PARAM_COUNT(); - } - - convert_to_string_ex(file); - - if (argc == 5 image_type == PHP_GDIMG_TYPE_GD2PART) { - multi_convert_to_long_ex(4, srcx, srcy, width, height); - if (Z_LVAL_PP(width) 1 || Z_LVAL_PP(height) 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING,Zero width or height not allowed); + if (image_type == PHP_GDIMG_TYPE_GD2PART) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, file, file_len, srcx, srcy, width, height) == FAILURE) { + return; + } + if (width 1 || height 1) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Zero width or height not allowed); RETURN_FALSE; } + } else { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, file, file_len) == FAILURE) { + return; + } } - fn = Z_STRVAL_PP(file); - - stream = php_stream_open_wrapper(fn, rb, ENFORCE_SAFE_MODE|REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL); + stream = php_stream_open_wrapper(file, rb, ENFORCE_SAFE_MODE|REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL); if (stream == NULL) { RETURN_FALSE; } @@ -2562,7 +2557,7 @@ } if (image_type == PHP_GDIMG_TYPE_GD2PART) { - im = (*ioctx_func_p)(io_ctx, Z_LVAL_PP(srcx), Z_LVAL_PP(srcy), Z_LVAL_PP(width), Z_LVAL_PP(height)); + im = (*ioctx_func_p)(io_ctx, srcx, srcy, width, height); } else { im = (*ioctx_func_p)(io_ctx); } @@ -2584,7 +2579,7 @@ if (!im fp) { switch (image_type) { case PHP_GDIMG_TYPE_GD2PART: - im = (*func_p)(fp, Z_LVAL_PP(srcx), Z_LVAL_PP(srcy), Z_LVAL_PP(width), Z_LVAL_PP(height)); + im = (*func_p)(fp, srcx, srcy, width, height); break; #if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED) case PHP_GDIMG_TYPE_XPM: @@ -2617,7 +2612,7 @@ return; } - php_error_docref(NULL TSRMLS_CC, E_WARNING, '%s' is not a valid %s file, fn, tn); + php_error_docref(NULL TSRMLS_CC, E_WARNING, '%s' is not a valid %s file, file, tn); out_err: php_stream_close(stream); RETURN_FALSE; @@ -4832,12 +4827,12 @@ #ifdef HAVE_GD_BUNDLED #define PHP_GD_SINGLE_RES \ - zval **SIM; \ + zval *SIM; \ gdImagePtr im_src; \ - if (zend_get_parameters_ex(1, SIM) == FAILURE) { \ + if (zend_parse_parameters(1 TSRMLS_CC, r, SIM) == FAILURE) { \ RETURN_FALSE; \ } \ - ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd); \ + ZEND_FETCH_RESOURCE(im_src, gdImagePtr, SIM, -1, Image, le_gd); \ if (im_src == NULL) { \ RETURN_FALSE; \ } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd_ctx.c?r1=1.22.2.5.2.3.2.1r2=1.22.2.5.2.3.2.2diff_format=u Index: php-src/ext/gd/gd_ctx.c diff -u php-src/ext/gd/gd_ctx.c:1.22.2.5.2.3.2.1
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
felipe Mon Aug 4 23:48:09 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: - Fix build (thanks Sebastian) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.15r2=1.312.2.20.2.32.2.16diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.15 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.16 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.15Mon Aug 4 18:23:33 2008 +++ php-src/ext/gd/gd.c Mon Aug 4 23:48:09 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.15 2008/08/04 18:23:33 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.16 2008/08/04 23:48:09 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2583,7 +2583,7 @@ break; #if defined(HAVE_GD_XPM) defined(HAVE_GD_BUNDLED) case PHP_GDIMG_TYPE_XPM: - im = gdImageCreateFromXpm(fn); + im = gdImageCreateFromXpm(file); break; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c /ext/gd/tests imageloadfont_invalid.phpt
pajoye Thu Jul 17 23:13:09 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/gd/tests imageloadfont_invalid.phpt Modified files: /php-src/ext/gd gd.c Log: - MFB: fix crash when some crafted font are given http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.10r2=1.312.2.20.2.32.2.11diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.10 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.11 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.10Tue Jul 8 15:24:12 2008 +++ php-src/ext/gd/gd.c Thu Jul 17 23:13:09 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.10 2008/07/08 15:24:12 tony2001 Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.11 2008/07/17 23:13:09 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1634,6 +1634,19 @@ body_size = font-w * font-h * font-nchars; } + if (overflow2(font-nchars, font-h)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Error reading font, invalid font header); + efree(font); + php_stream_close(stream); + RETURN_FALSE; + } + if (overflow2(font-nchars * font-h, font-w )) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, Error reading font, invalid font header); + efree(font); + php_stream_close(stream); + RETURN_FALSE; + } + if (body_size != body_size_check) { php_error_docref(NULL TSRMLS_CC, E_WARNING, Error reading font); efree(font); http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imageloadfont_invalid.phpt?view=markuprev=1.1 Index: php-src/ext/gd/tests/imageloadfont_invalid.phpt +++ php-src/ext/gd/tests/imageloadfont_invalid.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c php_gd.h
scottmacFri Jul 18 01:51:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c php_gd.h Log: Remove GD 1.0 support, still need to adjust the configure scripts to correctly check for a newer version http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.12r2=1.312.2.20.2.32.2.13diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.12 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.13 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.12Fri Jul 18 01:16:25 2008 +++ php-src/ext/gd/gd.c Fri Jul 18 01:51:48 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.12 2008/07/18 01:16:25 scottmac Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.13 2008/07/18 01:51:48 scottmac Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -181,7 +181,6 @@ ZEND_ARG_INFO(0, styles) /* ARRAY_INFO(0, styles, 0) */ ZEND_END_ARG_INFO() -#if HAVE_LIBGD20 static ZEND_BEGIN_ARG_INFO(arginfo_imagecreatetruecolor, 0) ZEND_ARG_INFO(0, x_size) @@ -199,7 +198,6 @@ ZEND_ARG_INFO(0, ditherFlag) ZEND_ARG_INFO(0, colorsWanted) ZEND_END_ARG_INFO() -#endif #if HAVE_GD_BUNDLED static @@ -209,7 +207,6 @@ ZEND_END_ARG_INFO() #endif -#if HAVE_LIBGD20 static ZEND_BEGIN_ARG_INFO(arginfo_imagesetthickness, 0) ZEND_ARG_INFO(0, im) @@ -250,7 +247,6 @@ ZEND_ARG_INFO(0, im) ZEND_ARG_INFO(0, save) ZEND_END_ARG_INFO() -#endif #if HAVE_GD_BUNDLED static @@ -260,7 +256,6 @@ ZEND_END_ARG_INFO() #endif -#if HAVE_LIBGD20 static ZEND_BEGIN_ARG_INFO(arginfo_imagecolorallocatealpha, 0) ZEND_ARG_INFO(0, im) @@ -310,7 +305,6 @@ ZEND_ARG_INFO(0, src_w) ZEND_ARG_INFO(0, src_h) ZEND_END_ARG_INFO() -#endif #ifdef PHP_WIN32 static @@ -814,7 +808,7 @@ ZEND_END_ARG_INFO() #ifdef ENABLE_GD_TTF -#if HAVE_LIBGD20 HAVE_LIBFREETYPE HAVE_GD_STRINGFTEX +#if HAVE_LIBFREETYPE HAVE_GD_STRINGFTEX static ZEND_BEGIN_ARG_INFO_EX(arginfo_imageftbbox, 0, 0, 4) ZEND_ARG_INFO(0, size) @@ -1014,7 +1008,6 @@ #endif PHP_FE(imagecopyresized, arginfo_imagecopyresized) PHP_FE(imagecreate, arginfo_imagecreate) -#if HAVE_LIBGD20 PHP_FE(imagecreatetruecolor, arginfo_imagecreatetruecolor) PHP_FE(imageistruecolor, arginfo_imageistruecolor) PHP_FE(imagetruecolortopalette, arginfo_imagetruecolortopalette) @@ -1028,7 +1021,6 @@ PHP_FE(imagecolorclosestalpha, arginfo_imagecolorclosestalpha) PHP_FE(imagecolorexactalpha, arginfo_imagecolorexactalpha) PHP_FE(imagecopyresampled, arginfo_imagecopyresampled) -#endif #ifdef PHP_WIN32 PHP_FE(imagegrabwindow, arginfo_imagegrabwindow) @@ -1113,7 +1105,7 @@ #ifdef ENABLE_GD_TTF PHP_FE(imagettfbbox, arginfo_imagettfbbox) PHP_FE(imagettftext, arginfo_imagettftext) -#if HAVE_LIBGD20 HAVE_LIBFREETYPE HAVE_GD_STRINGFTEX +#if HAVE_LIBFREETYPE HAVE_GD_STRINGFTEX PHP_FE(imageftbbox, arginfo_imageftbbox) PHP_FE(imagefttext, arginfo_imagefttext) #endif @@ -1168,7 +1160,7 @@ NULL, #endif NULL, -#if HAVE_LIBGD20 HAVE_GD_STRINGFT (HAVE_LIBFREETYPE (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)) +#if HAVE_GD_STRINGFT (HAVE_LIBFREETYPE (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)) PHP_RSHUTDOWN(gd), #else NULL, @@ -1262,14 +1254,12 @@ REGISTER_LONG_CONSTANT(IMG_COLOR_STYLEDBRUSHED, gdStyledBrushed, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_COLOR_TRANSPARENT, gdTransparent, CONST_CS | CONST_PERSISTENT); #endif -#if HAVE_LIBGD20 /* for imagefilledarc */ REGISTER_LONG_CONSTANT(IMG_ARC_ROUNDED, gdArc, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_PIE, gdPie, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_CHORD, gdChord, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_NOFILL, gdNoFill, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_ARC_EDGED, gdEdged, CONST_CS | CONST_PERSISTENT); -#endif /* GD2 image format types */ #ifdef GD2_FMT_RAW REGISTER_LONG_CONSTANT(IMG_GD2_RAW, GD2_FMT_RAW, CONST_CS |
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
tony2001Tue Jul 8 15:24:13 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.9r2=1.312.2.20.2.32.2.10diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.9 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.10 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.9 Sun Jul 6 17:07:26 2008 +++ php-src/ext/gd/gd.c Tue Jul 8 15:24:12 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.9 2008/07/06 17:07:26 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.10 2008/07/08 15:24:12 tony2001 Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4176,7 +4176,7 @@ Load a new font from specified file */ PHP_FUNCTION(imagepsloadfont) { - zval *file; + char *file; int file_len, f_ind, *font; #ifdef PHP_WIN32 struct stat st; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
sebastian Sun Jun 22 08:06:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: Fix build. http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.6r2=1.312.2.20.2.32.2.7diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.6 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.7 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.6 Sat Jun 21 22:07:52 2008 +++ php-src/ext/gd/gd.c Sun Jun 22 08:06:48 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.6 2008/06/21 22:07:52 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.7 2008/06/22 08:06:48 sebastian Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4542,7 +4542,7 @@ ZEND_WRONG_PARAM_COUNT(); } - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, srl|lld, str, str_len fnt, sz, sp, wd, angle) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, srl|lld, str, str_len, fnt, sz, sp, wd, angle) == FAILURE) { return; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c /ext/standard type.c
felipe Sun Jun 22 11:36:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c /php-src/ext/standard type.c Log: - Removed unused variables http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.7r2=1.312.2.20.2.32.2.8diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.7 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.8 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.7 Sun Jun 22 08:06:48 2008 +++ php-src/ext/gd/gd.c Sun Jun 22 11:36:46 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.7 2008/06/22 08:06:48 sebastian Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.8 2008/06/22 11:36:46 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -3267,7 +3267,6 @@ PHP_FUNCTION(imagegammacorrect) { zval *IM; - double inputgamma, outputgamma; gdImagePtr im; int i; double input, output; @@ -4721,7 +4720,6 @@ char *fn_org = NULL; char *fn_dest = NULL; FILE *org, *dest; - int argc = ZEND_NUM_ARGS(); int dest_height = -1; int dest_width = -1; int org_height, org_width; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/type.c?r1=1.30.2.2.2.3.2.6r2=1.30.2.2.2.3.2.7diff_format=u Index: php-src/ext/standard/type.c diff -u php-src/ext/standard/type.c:1.30.2.2.2.3.2.6 php-src/ext/standard/type.c:1.30.2.2.2.3.2.7 --- php-src/ext/standard/type.c:1.30.2.2.2.3.2.6Fri Jun 20 13:02:33 2008 +++ php-src/ext/standard/type.c Sun Jun 22 11:36:46 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: type.c,v 1.30.2.2.2.3.2.6 2008/06/20 13:02:33 felipe Exp $ */ +/* $Id: type.c,v 1.30.2.2.2.3.2.7 2008/06/22 11:36:46 felipe Exp $ */ #include php.h #include php_incomplete_class.h @@ -92,7 +92,6 @@ { zval **var; char *type; - char *new_type; int type_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Zs, var, type, type_len) == FAILURE) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c /ext/ldap ldap.c /ext/openssl openssl.c /ext/standard file.c streamsfuncs.c uniqid.c
colder Sun May 4 21:17:33 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c /php-src/ext/ldap ldap.c /php-src/ext/opensslopenssl.c /php-src/ext/standard file.c streamsfuncs.c uniqid.c Log: MFH: Fix protos http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.4r2=1.312.2.20.2.32.2.5diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.4 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.5 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.4 Fri Apr 4 17:42:18 2008 +++ php-src/ext/gd/gd.c Sun May 4 21:17:32 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.4 2008/04/04 17:42:18 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.5 2008/05/04 21:17:32 colder Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -4547,7 +4547,7 @@ } /* }}} */ -/* {{{ proto array imagepstext(resource image, string text, resource font, int size, int foreground, int background, int xcoord, int ycoord [, int space, int tightness, float angle, int antialias]) +/* {{{ proto array imagepstext(resource image, string text, resource font, int size, int foreground, int background, int xcoord, int ycoord [, int space [, int tightness [, float angle [, int antialias]) Rasterize a string over an image */ PHP_FUNCTION(imagepstext) { http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.7r2=1.161.2.3.2.11.2.8diff_format=u Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.7 php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.8 --- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.7 Wed Apr 16 14:21:04 2008 +++ php-src/ext/ldap/ldap.c Sun May 4 21:17:32 2008 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: ldap.c,v 1.161.2.3.2.11.2.7 2008/04/16 14:21:04 tony2001 Exp $ */ +/* $Id: ldap.c,v 1.161.2.3.2.11.2.8 2008/05/04 21:17:32 colder Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -237,7 +237,7 @@ php_info_print_table_start(); php_info_print_table_row(2, LDAP Support, enabled); - php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.11.2.7 2008/04/16 14:21:04 tony2001 Exp $); + php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.11.2.8 2008/05/04 21:17:32 colder Exp $); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links)); @@ -386,7 +386,7 @@ } /* }}} */ -/* {{{ proto bool ldap_bind(resource link [, string dn, string password]) +/* {{{ proto bool ldap_bind(resource link [, string dn [, string password]]) Bind to LDAP directory */ PHP_FUNCTION(ldap_bind) { @@ -496,7 +496,7 @@ } /* }}} */ -/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn, string password, string sasl_mech, string sasl_realm, string sasl_authc_id, string sasl_authz_id, string props]) +/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn [, string password [, string sasl_mech [, string sasl_realm [, string sasl_authc_id [, string sasl_authz_id [, string props]]]) Bind to LDAP directory using SASL */ PHP_FUNCTION(ldap_sasl_bind) { http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.8r2=1.98.2.5.2.41.2.9diff_format=u Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.8 php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.9 --- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.8 Wed Apr 2 14:35:29 2008 +++ php-src/ext/openssl/openssl.c Sun May 4 21:17:32 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: openssl.c,v 1.98.2.5.2.41.2.8 2008/04/02 14:35:29 tony2001 Exp $ */ +/* $Id: openssl.c,v 1.98.2.5.2.41.2.9 2008/05/04 21:17:32 colder Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -2138,7 +2138,7 @@ } /* }}} */ -/* {{{ proto bool openssl_csr_new(array dn, resource privkey [, array configargs, array extraattribs]) +/* {{{ proto bool openssl_csr_new(array dn, resource privkey [, array configargs [, array extraattribs]]) Generates a privkey and CSR */ PHP_FUNCTION(openssl_csr_new) { http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.12r2=1.409.2.6.2.28.2.13diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.12 php-src/ext/standard/file.c:1.409.2.6.2.28.2.13 --- php-src/ext/standard/file.c:1.409.2.6.2.28.2.12 Tue Apr 15 15:48:20 2008 +++ php-src/ext/standard/file.c Sun May 4 21:17:32 2008 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.12 2008/04/15 15:48:20 iliaa Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.13
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd gd.c
felipe Fri Apr 4 17:42:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd gd.c Log: MFB: Fixed bug #44591 (imagegif's filename parameter). http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.3r2=1.312.2.20.2.32.2.4diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.3 php-src/ext/gd/gd.c:1.312.2.20.2.32.2.4 --- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.3 Mon Mar 10 22:12:34 2008 +++ php-src/ext/gd/gd.c Fri Apr 4 17:42:18 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.32.2.3 2008/03/10 22:12:34 felipe Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.32.2.4 2008/04/04 17:42:18 felipe Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -2812,7 +2812,7 @@ } } - if ((argc == 2) || (argc 2 Z_STRLEN_PP(file))) { + if (argc = 2 Z_STRLEN_PP(file)) { PHP_GD_CHECK_OPEN_BASEDIR(fn, Invalid filename); fp = VCWD_FOPEN(fn, wb); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php