php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
This commit is contained in:
Remi Collet
2013-04-22 17:48:43 +02:00
parent 149cf2650a ec1678dd7c
commit 41ef288ced
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/gd/gd.c
View File

@@ -2411,6 +2411,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;
@@ -2432,6 +2434,7 @@ static int _php_image_type (char data[8])
}
}
}
#endif
#endif
return -1;
#endif