Remi Collet
70e0118b1b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
2013-05-08 07:37:46 +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
f5973141af
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
2013-05-06 10:25:41 +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
9b30ee7e0b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix previous (bad include)
2013-05-06 10:07:11 +02:00
Remi Collet
96a575123d
gd: fix previous (bad include)
2013-05-06 10:07:06 +02:00
Remi Collet
03091c834c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd
2013-05-06 10:02:34 +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
76665ca070
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix include...
2013-05-05 10:39:37 +02:00
Remi Collet
4cea61a0fa
gd: fix include...
2013-05-05 10:39:33 +02:00
Remi Collet
87de7b353b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:56:52 +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
e7ffb77341
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:34 +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
a47c5ed855
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: missing comma
2013-05-05 06:52:35 +02:00
Remi Collet
54d6f8b34e
gd: missing comma
2013-05-05 06:52:28 +02:00
Remi Collet
dca2cd2f98
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: fix typo and cleanups
2013-05-04 20:36:42 +02:00
Remi Collet
2ab270011d
gd: fix typo and cleanups
2013-05-04 20:36:32 +02:00
Remi Collet
71e76816ce
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
fix build with bundled libgd
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
Remove extra unused functions from gd_compat.h
Rewrite Xpm library check so it doesn't break on MultiArch systems
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
Remove overflow2, getmbi and skipheader, since they are not needed anymore.
Allow to use new GD-2.1.0 function from system library
2013-05-04 16:54:46 +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
fc666bdb83
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64738 , fix implicit type declaration
2013-04-30 08:03:46 +02:00
Pierre Joye
1a335d20a8
fix #64738 , fix implicit type declaration
2013-04-30 07:52:40 +02:00
Pierre Joye
eaec5522ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix #64725 , wrong res check
2013-04-27 17:52:38 +02:00
Pierre Joye
25c9f34c9c
fix #64725 , wrong res check
2013-04-27 17:52:30 +02:00
Pierre Joye
bba7f8aa31
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- #64710 , check return val
- #64710 , kill unused var
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , kill unused vars
#64710 , Implicit declaration
2013-04-26 08:16:02 +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
b0cf340eef
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:41:01 +02:00
Remi Collet
e12abebf50
Merge branch 'PHP-5.5'
...
* PHP-5.5:
gd: missing headers in previous
allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:16:25 +02:00
Remi Collet
5897696a02
Merge branch 'PHP-5.5'
...
* PHP-5.5:
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
gd: fix proto comment
2013-04-24 16:11:34 +02:00
Remi Collet
7264179eef
gd: fix proto comment
2013-04-24 14:43:59 +02:00