diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2006-03-05 18:26:12 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2006-03-05 18:26:12 +0000 |
| commit | dd659ea648a990f19ded080792d1527595e32047 (patch) | |
| tree | ddb1ed4a286ab0289c949c7196b03342c249b5de | |
| parent | b0f461e9d9d63c81c07e257493e237df8bbee8c3 (diff) | |
| download | php-git-dd659ea648a990f19ded080792d1527595e32047.tar.gz | |
- fixed size information for _php_sig_png array
- removed extra memcmp step in signature comparison,
this seemed to have been inherited from ext/standard/image.c
but is not needed here as the provided buffer is big enough
from the start
| -rw-r--r-- | ext/gd/gd.c | 6 | ||||
| -rw-r--r-- | ext/gd/php_gd.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 6c7958dd49..ab0af28e2f 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1254,10 +1254,8 @@ static int _php_image_type (char data[8]) return PHP_GDIMG_TYPE_GD2; } else if (!memcmp(data, php_sig_jpg, 3)) { return PHP_GDIMG_TYPE_JPG; - } else if (!memcmp(data, php_sig_png, 3)) { - if (!memcmp(data, php_sig_png, 8)) { - return PHP_GDIMG_TYPE_PNG; - } + } else if (!memcmp(data, php_sig_png, 8)) { + return PHP_GDIMG_TYPE_PNG; } else if (!memcmp(data, php_sig_gif, 3)) { return PHP_GDIMG_TYPE_GIF; } diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index d979e2c7c1..33f1981322 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -56,7 +56,7 @@ PHPAPI extern const char php_sig_gif[3]; PHPAPI extern const char php_sig_jpg[3]; -PHPAPI extern const char php_sig_png[3]; +PHPAPI extern const char php_sig_png[8]; extern zend_module_entry gd_module_entry; #define phpext_gd_ptr &gd_module_entry |