1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

1119 Commits

Author SHA1 Message Date
Anatol Belski 082ee90b9b fixe preprocessor definition 2013-05-15 14:24:21 +02:00
Remi Collet 36eee5b994 Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory 2013-05-08 07:37:40 +02:00
Remi Collet de7415ea55 gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff). 2013-05-06 10:25:36 +02:00
Remi Collet 96a575123d gd: fix previous (bad include) 2013-05-06 10:07:06 +02:00
Remi Collet 9480de29db Revert removal of overflow2 use in gd.c
Function provided by gd_security with bundled libgd
Function provided by gd_compat with system libgd

This fix failed test imageloadfont_invalid.phpt
This test now also pass with system libgd
2013-05-06 10:00:45 +02:00
Remi Collet 4cea61a0fa gd: fix include... 2013-05-05 10:39:33 +02:00
Remi Collet 0cae9a15d7 Move (back) missing functions in system libgd to gd_compat
- display libPng version in all cases
- gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:54:27 +02:00
Remi Collet 9a48b6506c gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd 2013-05-05 08:35:29 +02:00
Remi Collet 54d6f8b34e gd: missing comma 2013-05-05 06:52:28 +02:00
Remi Collet 2ab270011d gd: fix typo and cleanups 2013-05-04 20:36:32 +02:00
Remi Collet 00b097d2a3 fix build with bundled libgd 2013-05-04 16:51:56 +02:00
Ondřej Surý 2a2ac5f2be Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/. 2013-05-04 16:50:13 +02:00
Ondřej Surý e6704501f8 Remove extra unused functions from gd_compat.h 2013-05-04 16:50:11 +02:00
Ondřej Surý 5e9c6c3b64 Rewrite Xpm library check so it doesn't break on MultiArch systems 2013-05-04 16:50:08 +02:00
Ondřej Surý 8a90aad35b Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef 2013-05-04 16:50:06 +02:00
Ondřej Surý 2fc17d83cb * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm 2013-05-04 16:50:03 +02:00
Ondřej Surý 8a07908215 Remove overflow2, getmbi and skipheader, since they are not needed anymore. 2013-05-04 16:49:59 +02:00
Ondřej Surý 6aedadce0a Allow to use new GD-2.1.0 function from system library 2013-05-04 16:49:35 +02:00
Pierre Joye 1a335d20a8 fix #64738, fix implicit type declaration 2013-04-30 07:52:40 +02:00
Pierre Joye 25c9f34c9c fix #64725, wrong res check 2013-04-27 17:52:30 +02:00
Pierre Joye 2809afa119 - #64710, check return val 2013-04-26 08:15:33 +02:00
Pierre Joye 7bd20354a8 - #64710, kill unused var 2013-04-26 08:15:05 +02:00
Pierre Joye b0afef2d5e #64710, kill unused vars 2013-04-26 08:10:24 +02:00
Pierre Joye 685a6d9aab #64710, kill unused vars 2013-04-26 08:09:19 +02:00
Pierre Joye 7b06189702 #64710, kill unused vars 2013-04-26 08:08:38 +02:00
Pierre Joye 3fffc78ed0 #64710, kill unused vars 2013-04-26 08:07:47 +02:00
Pierre Joye b5902b6c9d #64710, kill unused vars 2013-04-26 08:06:34 +02:00
Pierre Joye afe46d4d47 #64710, Implicit declaration 2013-04-26 07:48:11 +02:00
Remi Collet 182fef46a9 Fixed bug #64707 missing declaration after dd0399f 2013-04-25 06:40:55 +02:00
Remi Collet 26bd2cba81 gd: missing headers in previous 2013-04-24 16:15:42 +02:00
Remi Collet 3a8ceed844 allow use of gdImageCreateFromJpegEx with system libgd 2013-04-24 16:15:11 +02:00
Remi Collet dd0399f5c6 We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
The new (Ex) functions are used with the new ignore_warning parameter

The standard functions are used in _php_image_create_from_string,
sent as a function pointer, and call without this optional parameter.
2013-04-24 16:07:50 +02:00
Remi Collet 7189cc5be8 gd: fix proto comment 2013-04-24 14:44:20 +02:00
Remi Collet aa4b0af20f gd: provide imageflip with system libgd when available 2013-04-24 14:32:03 +02:00
Remi Collet 2005a15caa fix copy/paste in error message 2013-04-23 13:53:00 +02:00
Remi Collet 9819d81ddf enable WebP with system libgd when available 2013-04-23 13:46:10 +02:00
Remi Collet eb50789910 (re)allow WBMP detection with system libgd
provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:43:57 +02:00
Remi Collet ec1678dd7c temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported 2013-04-22 17:48:28 +02:00
Remi Collet 6889a0d1f5 overflow2 is not exported by system libgd 2013-04-22 17:39:35 +02:00
Pierre Joye e71b794569 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:39 +02:00
Pierre Joye 684f4d5272 lucky that the name is not used, fix name of encoder 2013-04-11 06:42:38 +02:00
Pierre Joye 87f5d9aa1b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:46 +02:00
Pierre Joye c480bf3fb2 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:13:18 +02:00
Pierre Joye 224a67fb9f add external 2.1 detection and fix gd_compat for 2.1+ 2013-04-10 20:12:25 +02:00
Pierre Joye 24f1045d55 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix possible NULL deref
2013-04-09 10:09:47 +02:00
Pierre Joye aab5659357 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix possible NULL deref
2013-04-09 10:09:36 +02:00
Pierre Joye 88b3cdc4e9 fix possible NULL deref 2013-04-09 10:09:17 +02:00
Pierre Joye 4d6c367177 Merge branch 'PHP-5.4' into PHP-5.5
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:32 +02:00
Pierre Joye 10d62de4aa Merge branch 'PHP-5.3' into PHP-5.4
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:17 +02:00
Pierre Joye 4d4adf47e0 fix null deref 2013-04-09 10:04:01 +02:00