diff options
| author | Anatol Belski <ab@php.net> | 2014-03-12 19:31:21 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-12 19:31:21 +0100 |
| commit | f407482fcc0b8355d71519b644e9bd4da2d4bb69 (patch) | |
| tree | 6c77769fc3de2b5fc03c66af1ba7657d2e107d5e | |
| parent | 983e105d6b8987c1d69888e83d06082b10c5a769 (diff) | |
| parent | 0bf5bce6ad8184efc22495bd4eb15fcc9fe8dc46 (diff) | |
| download | php-git-f407482fcc0b8355d71519b644e9bd4da2d4bb69.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
made libgd recognize the 9 version series
| -rw-r--r-- | ext/gd/libgd/gd_jpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c index a882b28c88..7189c28b58 100644 --- a/ext/gd/libgd/gd_jpeg.c +++ b/ext/gd/libgd/gd_jpeg.c @@ -122,6 +122,10 @@ const char * gdJpegGetVersionString() return "8"; break; + case 90: + return "9 compatible"; + break; + default: return "unknown"; } |