diff options
| author | Anatol Belski <ab@php.net> | 2014-03-12 19:31:07 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-12 19:31:07 +0100 |
| commit | 0bf5bce6ad8184efc22495bd4eb15fcc9fe8dc46 (patch) | |
| tree | 0a3cfff0802955dc03d88f0ea63659467651dfcf /ext/gd | |
| parent | 75486555c2b0a28b9b3fe131231f3e8549f1f9ef (diff) | |
| parent | 3f049bcff2e00b118445752f7e651895ba9bea87 (diff) | |
| download | php-git-0bf5bce6ad8184efc22495bd4eb15fcc9fe8dc46.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
made libgd recognize the 9 version series
Diffstat (limited to 'ext/gd')
| -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"; } |