pajoye                                   Mon, 14 Jun 2010 08:12:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300425

Log:
- #52043,GD doesn't recognize latest libJPEG version

Bug: http://bugs.php.net/52043 (Assigned) GD doesn't recognize latest libJPEG 
version (8b)
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    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/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-06-14 07:26:48 UTC (rev 300424)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-06-14 08:12:10 UTC (rev 300425)
@@ -71,6 +71,8 @@
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)

+- Fixed bug #52043 (GD doesn't recognize latest libJPEG versions).
+  (php at group dot apple dot com, Pierre)
 - Fixed bug #52060 (Memory leak when passing a closure to method_exists()).
   (Felipe)
 - Fixed bug #52057 (ReflectionClass fails on Closure class). (Felipe)

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-14 07:26:48 UTC 
(rev 300424)
+++ php/php-src/branches/PHP_5_3/ext/gd/libgd/gd_jpeg.c 2010-06-14 08:12:10 UTC 
(rev 300425)
@@ -113,6 +113,15 @@
                case 62:
                        return "6b";
                        break;
+
+               case 70:
+                       return "7";
+                       break;
+
+               case 80:
+                       return "8";
+                       break;
+
                default:
                        return "unknown";
        }

Modified: php/php-src/trunk/ext/gd/libgd/gd_jpeg.c
===================================================================
--- php/php-src/trunk/ext/gd/libgd/gd_jpeg.c    2010-06-14 07:26:48 UTC (rev 
300424)
+++ php/php-src/trunk/ext/gd/libgd/gd_jpeg.c    2010-06-14 08:12:10 UTC (rev 
300425)
@@ -113,6 +113,15 @@
                case 62:
                        return "6b";
                        break;
+
+               case 70:
+                       return "7";
+                       break;
+
+               case 80:
+                       return "8";
+                       break;
+
                default:
                        return "unknown";
        }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to