diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 21:08:55 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 21:08:55 -0700 |
| commit | 4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd (patch) | |
| tree | 712e3f765eb4ea4d0293de6e55f28a182579a82f /ext/gd | |
| parent | 3c166c47584c7a7eb8c1ce42ea05a8a5677da028 (diff) | |
| parent | cd14de94d2428a28c8bfad1aad9837c59ab81e8f (diff) | |
| download | php-git-4824d0f43e6d8742eafb5e751f3c9a3d7da3f3cd.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Reduce compiler noise by removing unused variables and labels
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/gd.c | 2 | ||||
| -rw-r--r-- | ext/gd/libgd/gd.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index b7af06e7fb..d8a90f5fb6 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -2442,7 +2442,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, fflush(fp); } -register_im: +/* register_im: */ if (im) { ZEND_REGISTER_RESOURCE(return_value, im, le_gd); php_stream_close(stream); diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 7ed6617c57..54890bc177 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -3011,7 +3011,6 @@ void gdImageGetClip (gdImagePtr im, int *x1P, int *y1P, int *x2P, int *y2P) int gdImagePaletteToTrueColor(gdImagePtr src) { unsigned int y; - unsigned char alloc_y = 0; unsigned int yy; if (src == NULL) { |