com php-src: temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported: ext/gd/gd.c
| From: | Remi Collet | Date: | Mon, 22 Apr 2013 15:48:28 +0000 |
| Subject: | com php-src: temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71968@lists.php.net to get a copy of this message | ||
Commit: ec1678dd7c1c802748f8a5d6811c571cc5752a6a
Author: Remi Collet <remi@php.net> Mon, 22 Apr 2013 17:48:28 +0200
Parents: 6889a0d1f5a2eaa8103216d9cb01160e7a637f8d
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ec1678dd7c1c802748f8a5d6811c571cc5752a6a
Log:
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
Changed paths:
M ext/gd/gd.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ba18b85..6cafb51 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -2403,6 +2403,8 @@ static int _php_image_type (char data[8])
} else if (!memcmp(data, php_sig_gif, 3)) {
return PHP_GDIMG_TYPE_GIF;
}
+/* Temporary disabled, as gdGetC, getmbi and skipheader not exported in system libgd */
+#if HAVE_GD_BUNDLED
#ifdef HAVE_GD_WBMP
else {
gdIOCtx *io_ctx;
@@ -2425,6 +2427,7 @@ static int _php_image_type (char data[8])
}
}
#endif
+#endif
return -1;
#endif
}