svn: /php/php-src/ branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c trunk/ext/gd/libgd/gd_jpeg.c

pajoye Wed, 30 Jun 2010 22:06:49 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300886 Log: - WS Changed paths: U php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c U php/php-src/trunk/ext/gd/libgd/gd_jpeg.c Modified: php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c 2010-06-30 19:11:16 UTC (rev 300885) +++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c 2010-06-30 22:06:49 UTC (rev 300886) @@ -51,9 +51,9 @@ char message[JMSG_LENGTH_MAX]; jmpbuf_wrapper *jmpbufw; int ignore_warning = 0; - - jmpbufw = (jmpbuf_wrapper *) jpeg_info->client_data; + jmpbufw = (jmpbuf_wrapper *) jpeg_info->client_data; + if (jmpbufw != 0) { ignore_warning = jmpbufw->ignore_warning; } Modified: php/php-src/trunk/ext/gd/libgd/gd_jpeg.c =================================================================== --- php/php-src/trunk/ext/gd/libgd/gd_jpeg.c 2010-06-30 19:11:16 UTC (rev 300885) +++ php/php-src/trunk/ext/gd/libgd/gd_jpeg.c 2010-06-30 22:06:49 UTC (rev 300886) @@ -51,9 +51,9 @@ char message[JMSG_LENGTH_MAX]; jmpbuf_wrapper *jmpbufw; int ignore_warning = 0; - - jmpbufw = (jmpbuf_wrapper *) jpeg_info->client_data; + jmpbufw = (jmpbuf_wrapper *) jpeg_info->client_data; + if (jmpbufw != 0) { ignore_warning = jmpbufw->ignore_warning; }