clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
83,062 Commits 491 Branches 1,363 Tags 846 MiB
f5f94d9c08
Commit Graph

433 Commits

Author SHA1 Message Date
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
Pierre Joye
780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye
a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Pierre Joye
a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +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
22aeb976e0 - add todo for threshold 2013-02-28 19:34:14 +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
af5bf879aa - add image flip API support 2013-02-27 10:39:09 +01:00
Pierre Joye
246de922e6 - add image flip API support 2013-02-27 10:37:48 +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
Rasmus Lerdorf
f8c280d85a These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:15 -08:00
Rasmus Lerdorf
f452b9056e These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:07 -08:00
Rasmus Lerdorf
261e32f623 These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:56:19 -08:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Florian Anderiasch
6972b94ae5 Fixed #60160 and added a test for it 2011-11-01 11:51:53 +00:00
Florian Anderiasch
58a134fb48 Fixed #60160 and added a test for it 2011-11-01 11:51:53 +00:00
Pierre Joye
63aae8a69b - stream output support for image outputs functions 2011-01-03 09:22:58 +00:00
Pierre Joye
76d273d455 - don't build if no libvpx available 2010-10-06 09:02:08 +00:00
Ilia Alshanetsky
7b2a2eb326 Removed debug code 2010-10-05 12:27:00 +00:00
Pierre Joye
12f855b3be - missing file for webp 2010-10-04 22:34:02 +00:00
Pierre Joye
dfb96b3b95 - 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:33:07 +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
1fe5265c3e - WS 2010-06-30 22:06:49 +00:00
Pierre Joye
425c528783 - WS 2010-06-30 22:06:49 +00:00
Pierre Joye
c145a3754b - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Pierre Joye
d652e02235 - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Rasmus Lerdorf
5583cd237f Check for -1 as well here 2010-05-24 23:52:11 +00:00
Rasmus Lerdorf
a906125fec Check for -1 as well here 2010-05-24 23:52:11 +00:00
Rasmus Lerdorf
159369c68c Let's have a sane error message here instead of some cryptic zlib error 2010-05-24 23:27:39 +00:00
Rasmus Lerdorf
13a09194a9 Let's have a sane error message here instead of some cryptic zlib error 2010-05-24 23:27:39 +00:00
Pierre Joye
0688e6ef01 - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +00:00
Pierre Joye
ef76df031b - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +00:00
Pierre Joye
07446082c8 - Fix #51671, imagefill does not work correctly for small images 2010-04-28 08:23:44 +00:00
Pierre Joye
c09a8cb043 - Fix #51671, imagefill does not work correctly for small images 2010-04-28 08:23:44 +00:00
Pierre Joye
eaab2fbc4b - WS 2010-04-28 08:04:52 +00:00
Pierre Joye
27d922c49f - WS 2010-04-28 08:04:52 +00:00
Takeshi Abe
42c14bf473 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Takeshi Abe
a46e108b83 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Takeshi Abe
bea0320749 fix libgd FS100 (spurious horizontal line drawn by gdImageFilledPolygon) 2010-01-20 09:39:06 +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
Takeshi Abe
dd17af94c5 removed an unused variable 2010-01-13 06:55:03 +00:00
Pierre Joye
7aacc1ccbc - use png_sig_cmp to support libpng 1.4, old is deprecated already in older version 2010-01-10 02:13:45 +00:00
Takeshi Abe
c18d4364ed Bug #49600 (imageTTFText text shifted right) 
- fix difference of horizontal position between imagettftext() and imagettfbbox()
 2010-01-08 12:18:52 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Takeshi Abe
94cb01177a Fixed a possible memory leak in case that FT_Glyph_To_Bitmap() fails 2009-11-01 05:04:35 +00:00
Pierre Joye
ed3e96197d - check max colors while loading gd2 palette image (patch by Tomas Hoger) 2009-10-12 10:01:37 +00:00
Pierre Joye
8f8220917e - Fix sanity check for the color index in imagecolortransparent 2009-09-03 09:45:56 +00:00
Ilia Alshanetsky
3189707681 Fixed bug #49193 (gdJpegGetVersionString() inside gd_compact identifies wrong type in declaration) 2009-08-09 13:15:45 +00:00
Kalle Sommer Nielsen
b5b8303194 Fixed bug #42434 (ImageLine w/ antialias = 1px shorter) 
- patch by wojjie at gmail dot com
 2009-07-28 20:35:06 +00:00
Takeshi Abe
366c261cce MFH: fixed #48732 (TTF Bounding box wrong for letters below baseline) and #48801 (Problem with imagettfbbox) 2009-07-27 15:06:28 +00:00
Pierre Joye
c79f7e3f6b - WS 2009-07-07 10:54:44 +00:00
Pierre Joye
b38fde4694 - #45905, imagefilledrectangle() clipping error 2009-07-07 10:49:38 +00:00
Pierre Joye
1f10584566 - add license info 2009-06-24 11:44:46 +00:00
Takeshi Abe
c84e4181b4 MFH: fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) 2009-06-21 06:09:46 +00:00
Pierre Joye
45832feb40 - fix build 2009-05-27 15:16:18 +00:00
Pierre Joye
7f6fa6ce1c - fix build on unix with bundled gd 2009-05-27 13:48:13 +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
6b3e2b1910 - expose gdImageGetTrueColorPixel in bundled lib 
- fix bundled lib build
 2009-05-26 13:08: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
Kalle Sommer Nielsen
437e9e6c7c This shouldn't have been in for now 2009-04-25 06:25:55 +00:00
Kalle Sommer Nielsen
9a718dd97c MFH: Use correct data types here, and gdImageSaveAlpha for the alpha flag 2009-04-25 06:22:14 +00:00
Takeshi Abe
47b6dc50a4 MFHcheck non-null before any use. 2009-04-23 16:26:17 +00:00
Ilia Alshanetsky
c593790b62 Fixed bug #47946 (ImageConvolution overwrites background) 
# original patch by  jcolby at acsol dot net
 2009-04-12 14:43:21 +00:00
Pierre Joye
24225b88bd - silent warning or possible linker error on win 2009-04-07 13:01:27 +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
Pierre Joye
2350110e55 - initial import, support for external gd library while keeping bug fixes or features (more will be activated later) 2009-04-07 09:24:34 +00:00
Takeshi Abe
335ba19297 MFH: 
replaced static gdPngJmpbufStruct, which is afraid of being shared with
several threads, by a couple of auto variables.
 2009-04-01 16:06:56 +00:00
Takeshi Abe
3e3721be58 MFH: Fixed libgd #186 (Tiling true colour with palette image does not work) 2009-03-18 15:30:37 +00:00
Pierre Joye
d5f2191170 - #43073, TrueType bounding box is wrong for angle<>0 2009-03-18 00:29:42 +00:00
Takeshi Abe
d2709b764c MFH: Fixed bug #45799 (imagepng() crashes on empty image) 2009-03-14 16:08:00 +00:00
Takeshi Abe
a2bc965760 MFH: fixed typos 2009-02-13 16:03:02 +00:00
Takeshi Abe
3ac3b44048 MFH: 
- fixed memory leaks in gdImageCreateFromXpm()
- dropped unused codes
 2009-02-11 17:56:44 +00:00
Takeshi Abe
b48f46b092 MFH: optimization via the row-major order. 2009-02-11 16:31:27 +00:00
Takeshi Abe
c422d15d0e MFH: fixed the bug of libgd #191 (A circle becomes square) 2009-01-19 15:43:48 +00:00
Takeshi Abe
40d3b2f7f3 MFH: added pixelate filter. 2009-01-14 19:06:12 +00:00
Pierre Joye
9880d8dbe7 - [DOC] support for PNG gray levels+ alpha image, loaded as truecolor 2009-01-14 10:16:15 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Scott MacVicar
fdb9b62cef MFH Fix segfault and potential security issue in imagerotate(). 2008-12-10 13:32:02 +00:00
Pierre Joye
789eb9cc9a - fix build on linux (static) 
- add gd[Format]Version[Int|String] first methods to work around the png
  header issues
 2008-11-06 10:14:37 +00:00
Rasmus Lerdorf
a3383ac3d7 Fix for bug #45030 2008-07-31 09:23:18 +00:00
Scott MacVicar
62de800b36 Remove freetype1 support 2008-07-18 01:16:25 +00:00
Pierre Joye
3a6acb42b2 - MFB: #43790, fix crash when no family name has been found 2008-01-09 01:51:17 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Mattias Bengtsson
81a874710e -MFB, Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) 2007-11-04 23:56:41 +00:00
Mattias Bengtsson
b6e317e25c -MFB, Be paranoid and dont allow multiplication with zero 2007-10-23 01:58:30 +00:00
Ilia Alshanetsky
79325e3c55 MFH: Fixed function definition 2007-09-11 23:34:25 +00:00
Pierre Joye
fd15282c77 - [DOC] add alpha support for imagefilter's IMG_FILTER_COLORIZE 2007-09-11 21:03:48 +00:00
Pierre Joye
7ea43ee23a - re-add fix for libgd #106, imagerectangle draws 1x1 rectangles 
as 1x3 rectangles
 2007-09-09 13:05:51 +00:00
Pierre Joye
73fcf22627 - revert fix for #106 
- add news entry for pslib fix
  NB: Please next time, inform us before a complete freeze is done for
      a given branch. And a week for a RC is defitively too short.
 2007-08-27 08:27:45 +00:00
Pierre Joye
0d98b9a1d9 - MFB: gd #106, imagerectangle draws 1x1 rectangles as 1x3 rectangles 2007-08-26 20:35:11 +00:00
Mattias Bengtsson
3126445073 - libgd #101, imagecreatefromgd can crash if gdImageCreate fails 2007-08-09 14:21:38 +00:00
Mattias Bengtsson
436a7a9767 - libgd #94, imagecreatefromxbm can crash if gdImageCreate fails 2007-08-09 12:08:29 +00:00
Nuno Lopes
74474a1ef8 malloc+memset == calloc (sync with libgd) 2007-06-17 19:03:58 +00:00
Pierre Joye
fcd0a1e790 - Drop useless tests (Daniel Diaz) 2007-06-17 16:51:50 +00:00
Pierre Joye
bf348c8c46 - MFH: #41717, imagepolygon does not respect thickness 
(sync with libgd)
 2007-06-17 10:56:51 +00:00
Nuno Lopes
93cf41436b sync with libgd: improve _gdImageFillTiled() 2007-06-15 19:47:10 +00:00
Pierre Joye
f5f04f2214 - Fixed regression introduced by the fix for the libgd bug #74 2007-06-14 19:17:31 +00:00
Pierre Joye
c4b5196d0b - #41630, fix segfault when an invalid color index is present in the image 
data
 2007-06-07 21:07:33 +00:00
Antony Dovgal
8853804482 MFH: fix several integer overflows in GD 2007-06-06 09:45:43 +00:00
Pierre Joye
256de924c7 - MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION 
GD_EXTRA_VERSION and GD_VERSION_STRING
 2007-06-03 17:46:18 +00:00
Pierre Joye
587de83684 - MFH: libgd #86: Fixed possible infinite loop in libgd/gd_png.c 
(Reported by Xavier Roche)
 2007-05-16 22:19:08 +00:00
Scott MacVicar
65408b1520 MFH: Fixed bug #40130 (TTF usage doesn't work properly under Netware). 2007-04-23 15:17:47 +00:00
Pierre Joye
ffaaaa4df0 - MFH: libgd #74, gdImageFilledArc, huge CPU usage with large angles 2007-04-14 17:33:15 +00:00
Nuno Lopes
5833fc40dc fix race condition on font cache shutdown 2007-04-04 14:24:03 +00:00
Pierre Joye
539be2cc81 - do not try to use the global color map when none was found (Nuno, Pierre) 
- free im on error
 2007-04-04 11:40:11 +00:00
Pierre Joye
e4749c609c - Sync with gd 2.0.35 (bug #52, #60 and #66) 
- Improve TS of gif loading code (Roman Nemecek, Nuno, Pierre)
 - a frame size must be confined to the screen defition (Pierre)
 - be sure to always read the dimensions in the frame and does not use
   the screen size (see #66 for a side effect) (Pierre)
- Update #37360 test. The frame does not fit the logical screen (specs
  tell that it must fit) (Pierre)
 2007-04-04 01:34:50 +00:00
Pierre Joye
6ef9642b16 - MFH: 
- remove double lock (tween colors cache is created in each thread, the
   cache mutex is already locked earlier)
 - #40858, other TS improvements for gd freetype cache management
   cache initialization and shutdown is now done in MINIT and MSHUTDOWN.
 2007-04-04 00:47:55 +00:00
Pierre Joye
a9ca51ff1a . colors allocated henceforth from the resulting image overwrite 
the palette colors (sync with 2.0.34) (Rob Leslie)
 2007-04-04 00:30:18 +00:00
Pierre Joye
cb11ba761e - MFH: CVE-2007-1001, integer overflow with invalid wbmp images 2007-03-10 12:18:36 +00:00
Pierre Joye
1286d9e266 - #40764, line thickness not respected for horizontal and vertical lines 2007-03-09 01:18:40 +00:00
Nuno Lopes
5116b67016 fix thread unsafety in the gif reader code (merge from libgd cvs) 2007-03-08 20:24:53 +00:00
Nuno Lopes
7b37c41384 fix access to non initialized memory (check valgrind reports on http://gcov.php.net) 2007-03-02 18:41:25 +00:00
Nuno Lopes
e5c4b50127 merge from gd sources: unlock mutex before shuting it down 2007-03-01 18:39:49 +00:00
Pierre Joye
dfeff9efe6 - sync with libgd.org, patch from Kees Cook 2007-02-25 02:45:06 +00:00
Ilia Alshanetsky
9783f5f1f3 strncpy() -> strlcpy() 2007-02-24 18:00:56 +00:00
Marcus Boerger
50ea26760d - Avoid sprintf, even when checked copy'n'paste or changes lead to errors 2007-02-24 02:17:47 +00:00
Pierre Joye
b5e6c78eda - #40578, fix the 2nd race condition on shutdown when the cache is freed 2007-02-23 00:58:49 +00:00
Antony Dovgal
94bab7b206 MFH: fix #40578 (imagettftext() multithreading issue) 2007-02-21 15:00:26 +00:00
Pierre Joye
4dafc7a2fa - save/restore the alpha blending mode correctly in imagefill and 
imagefilltoborder
 2007-01-19 15:03:56 +00:00
Nuno Lopes
8815fdf5e0 OMG, this line was really bogus (and allocating huge amounts of memory unecessarly) 2007-01-13 11:21:21 +00:00
Nuno Lopes
e22c9cd775 fix valgrind error in test bug24594.phpt 
while at it, remove some dead code and change the pts vector to char to save (much) memory
# Pierre: one more to merge ;)
 2007-01-13 11:16:15 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Pierre Joye
9e533e39b6 - MFH:#39780, PNG image with CRC/data error raises fatal error 2006-12-10 01:38:02 +00:00
Pierre Joye
df56d24304 - #39508, do not use the 4 neighbors implementation for small images (w<4) 
test will follow
 2006-11-14 13:45:24 +00:00
Pierre Joye
5784602544 - Merge from gd-cvs, initialize the signature not the infile ctx 
NB: good that we don't use getC :)
 2006-11-05 15:04:50 +00:00
Pierre Joye
4e257c03a1 - WS 2006-11-04 14:34:33 +00:00