clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,451 Commits 494 Branches 1,367 Tags 807 MiB
87de7b353b
Commit Graph

500 Commits

Author SHA1 Message Date
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
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ý
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ý
6aedadce0a Allow to use new GD-2.1.0 function from system library 2013-05-04 16:49:35 +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
b0afef2d5e #64710, kill unused vars 2013-04-26 08:10:24 +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
afe46d4d47 #64710, Implicit declaration 2013-04-26 07:48:11 +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
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
Remi Collet
1d72ea493d Merge branch 'PHP-5.5' 
* PHP-5.5:
  gd: provide imageflip with system libgd when available
 2013-04-24 14:32:09 +02:00
Remi Collet
92a1640694 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix copy/paste in error message
 2013-04-23 13:53:07 +02:00
Remi Collet
2005a15caa fix copy/paste in error message 2013-04-23 13:53:00 +02:00
Remi Collet
2fa178fa41 Merge branch 'PHP-5.5' 
* PHP-5.5:
  enable WebP with system libgd when available
  (re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
 2013-04-23 13:46:24 +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
41ef288ced Merge branch 'PHP-5.5' 
* PHP-5.5:
  temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
 2013-04-22 17:48:43 +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
Pierre Joye
e2f3c7f2bc Merge branch 'PHP-5.5' 
* PHP-5.5:
  lucky that the name is not used, fix name of encoder
 2013-04-11 07:08:58 +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
ca1962949e Merge branch 'PHP-5.5' 
* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
 2013-04-10 20:14:00 +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
95f830bc81 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix BELL constant declaration
 2013-03-28 22:14:50 +01:00
Pierre Joye
ac0b66f160 fix BELL constant declaration 2013-03-28 22:14:34 +01:00
Pierre Joye
33e834aab8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add WebP support in phpinfo
 2013-03-27 17:39:05 +01:00
Pierre Joye
e7d88a63fa add WebP support in phpinfo 2013-03-27 17:38:57 +01:00
Pierre Joye
705ab20252 Merge branch 'PHP-5.5' 
* PHP-5.5:
  FALSE on error
 2013-03-27 05:13:42 +01:00
Pierre Joye
f3ebb40ad6 FALSE on error 2013-03-27 05:13:30 +01:00
Pierre Joye
111123af4f conflict 2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb fix regression, take #2 (merge issue due to git 1.8 default setting changes) 2013-03-26 11:23:15 +01:00
Pierre Joye
dd9e4b34d6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt), fix for all cases
 2013-03-22 09:30:32 +01:00
Pierre Joye
f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye
672f8525fb Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt
 2013-03-22 09:21:23 +01:00