archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
103071 commits 526 branches 1434 tags 879 MiB
Commit graph

615 commits

Author SHA1 Message Date
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
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ý
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
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
7bd20354a8 - #64710, kill unused var 2013-04-26 08:15:05 +02:00
Pierre Joye
685a6d9aab #64710, kill unused vars 2013-04-26 08:09:19 +02:00
Pierre Joye
b5902b6c9d #64710, kill unused vars 2013-04-26 08:06:34 +02:00
Remi Collet
182fef46a9 Fixed bug #64707 missing declaration after dd0399f 2013-04-25 06:40:55 +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
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
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
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
149cf2650a Merge branch 'PHP-5.5' 
* PHP-5.5:
  overflow2 is not exported by system libgd
 2013-04-22 17:39:54 +02:00
Remi Collet
6889a0d1f5 overflow2 is not exported by system libgd 2013-04-22 17:39:35 +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
d0cd049312 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix possible NULL deref
 2013-04-09 10:09:54 +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
f4308084d8 Merge branch 'PHP-5.5' 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:41 +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
Pierre Joye
396b1109cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  ws and comment for recommended aa method
 2013-04-09 07:05:03 +02:00
Pierre Joye
83500123d0 ws and comment for recommended aa method 2013-04-09 07:04:52 +02:00
Pierre Joye
21cfbdf42c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix some unitialized values and typo
 2013-04-09 06:45:24 +02:00
Pierre Joye
85ad65ef40 fix some unitialized values and typo 2013-04-09 06:44:45 +02:00
Pierre Joye
8a85da4a61 merging conflict left over 2013-03-26 17:46:29 +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
Stanislav Malyshev
c1ac5a20a5 fix typo 2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b fix typo 2013-03-24 20:03:57 -07:00
Pierre Joye
f21f37bb4c Merge branch 'PHP-5.5' 
* PHP-5.5:
  remove comments
 2013-03-25 03:14:40 +01:00
Pierre Joye
1b34ab8ff8 remove comments 2013-03-25 03:14:27 +01:00
Pierre Joye
94c083ba64 fix conflict 2013-03-24 16:54:55 +01:00
Pierre Joye
be3e2bb295 fix generic rotation and 90 degrees & multiples rotation, take #2 2013-03-24 16:52:20 +01:00
Pierre Joye
f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye
f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye
4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
Pierre Joye
f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00