clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,744 Commits 494 Branches 1,367 Tags 814 MiB
ffaf8beda7
Commit Graph

537 Commits

Author SHA1 Message Date
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
Pierre Joye
f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye
2a8a9c0007 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt)
 2013-03-22 08:28:25 +01:00
Pierre Joye
4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
Pierre Joye
09854f1fb9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
 2013-03-20 12:34:51 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye
780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye
22159fb7b7 - add new interpolation method 
. imagescale
  . imageaffine
  . replace imagerotate with new generic and optimized new implementations
  . imagesetinterpolationmethod, to set the default interpolation to be
    used with the new functions
  . add imagepalettetotruecolor
 2013-03-20 07:46:59 +01:00
Pierre Joye
0a55c4b1dd - (s)rgb distance works way better for now, re enable threshold 2013-03-03 05:30:12 +01:00
Pierre Joye
7698bc5735 - disable threshold for now, will enable it again using CIEDE2000 2013-03-01 08:10:49 +01:00
Pierre Joye
0c32a18d4c - clean and enable threshold 2013-02-28 19:22:06 +01:00
Pierre Joye
a991360344 - add image crop support 2013-02-28 17:24:23 +01:00
Pierre Joye
82765a0780 - typo 2013-02-27 21:02:47 +01:00
Pierre Joye
74983a45cc - fix name for imageflip constants, consistent witht the other 2013-02-27 20:23:31 +01:00
Pierre Joye
34adce6c47 - add constants for imageflip 2013-02-27 20:08:26 +01:00
Pierre Joye
fa940a60de - add image flip API support 2013-02-27 10:39:25 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Anatoliy Belsky
5d9fb8ffeb exposing the libxpm version in phpinfo 2012-10-04 18:20:02 +02:00
Anatoliy Belsky
9a99426e80 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  exposing the libxpm version in phpinfo
 2012-10-04 18:21:07 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Pierre Joye
0df43f2803 - kill c++ comment 2011-01-03 09:33:27 +00:00
Pierre Joye
63aae8a69b - stream output support for image outputs functions 2011-01-03 09:22:58 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Martin Jansen
f6cedd2ad5 Merge from trunk: 
* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.
 2010-12-11 20:10:39 +00:00
Martin Jansen
02ff4766c9 * Fixed parameter check introduced with the recent fix for bug #53492. 
* Improved the error message along the way.
 2010-12-11 20:09:39 +00:00
Pierre Joye
088a6ad7b5 - Fix #53492, fix crash if aa steps are invalid 2010-12-08 08:45:56 +00:00
Pierre Joye
a0eb5848b5 - Fix #53492, fix crash if aa steps are invalid 2010-12-08 08:45:56 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Felipe Pena
f1d905a417 - Fix build 2010-10-04 23:05:32 +00:00
Pierre Joye
cccc349aa5 - initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g) 2010-10-04 22:30:35 +00:00
Pierre Joye
aa297b60a3 - zend_list_insert TSRMLS fix (thx tony for the headup) 2010-09-16 13:34:51 +00:00
Pierre Joye
fa78b4497e - #51793, Add alpha argument to imagecolorset 2010-05-18 12:38:57 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Takeshi Abe
e3e76d7baf fix wrong type and useless assignments 2010-01-15 17:09:14 +00:00
Takeshi Abe
f7a3b3f5aa imagepolygon() and imagefilledpolygon() does not allow negative number of points causing invalid allocation 2010-01-14 11:11:56 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Pierrick Charron
c2fccc1606 - Fixed bug #50469 (Fixed typo in imagepsencodefont error string). 2009-12-14 04:09:18 +00:00
Kalle Sommer Nielsen
17459bac7d MFH: Fix memleak 2009-06-19 22:15:28 +00:00
Pierre Joye
f726afbfeb - [DOC] always enable imagecolormatch 2009-05-27 08:18:24 +00:00
Pierre Joye
59ec80c572 - MFH: [DOC] always enable imagerotate (bundled or system gd) 2009-05-27 07:18:05 +00:00
Pierre Joye
a008f130cd - MFH: [DOC] - add image(filled)ellipse to the compat layer (work around a bug in debian too, function is declared but not present in the lib...) 2009-05-26 20:14:31 +00:00
Pierre Joye
4988470303 - ws 2009-05-26 13:57:07 +00:00
Pierre Joye
704d7587b0 - enable filter constants 2009-05-26 13:35:59 +00:00
Pierre Joye
b682f42915 - [DOC] always enable imagefilter and imageconvolution, even when built against system's gd 2009-05-26 12:50:40 +00:00
Pierre Joye
8cd0428d09 - ws 2009-04-07 12:45:26 +00:00
Pierre Joye
039a154633 - #47812, undefined symbol: gdJpegGetVersionInt 
- #46015, Build fails with system gd
- enable gd_compat when built using system's gd
 2009-04-07 09:26:22 +00:00
Felipe Pena
6f7cc9a390 - Missing changes related to #47757 for this branch 2009-03-26 00:43:45 +00:00
Pierre Joye
bc272fdc68 - GEPJ.. (thx to Derick for the head!) 2009-03-24 12:48:52 +00:00
Pierre Joye
868d7d8144 - #47757 rename JPG to JPEG in phpinfo 2009-03-24 09:41:42 +00:00
Kalle Sommer Nielsen
8dab524e82 MFH: Fix arginfo for imagefilter() 2009-01-31 15:27:52 +00:00
Takeshi Abe
78ca92f77b MFH: bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number. 2009-01-19 16:35:58 +00:00
Kalle Sommer Nielsen
be7d6a6299 MFH: Change optional parameter for IMG_FILTER_PIXELATE to be a boolean 
Added missing NEWS log entry for the new pixelation filter
 2009-01-15 07:57:11 +00:00
Takeshi Abe
40d3b2f7f3 MFH: added pixelate filter. 2009-01-14 19:06:12 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Hannes Magnusson
f6cf54d2b1 Fixed bug#46847 (phpinfo() is missing some settings.) 2008-12-12 13:07:28 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Pierre Joye
963f7c0234 - typo 2008-11-06 10:17:44 +00:00