Commit Graph

154 Commits

Author SHA1 Message Date
Christoph M. Becker
16d6a93f09 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
2015-07-21 01:20:02 +02:00
Christoph M. Becker
f1228ebc61 Merge branch 'pull-request/1425' into PHP-5.6
* pull-request/1425:
  revised bug53156.phpt
  Fix #53156: imagerectangle problem with point ordering
2015-07-21 01:13:04 +02:00
Christoph M. Becker
ea37ca7707 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
2015-07-20 23:44:04 +02:00
Christoph M. Becker
e7f2356665 Fix #66387: Stack overflow with imagefilltoborder
The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.
2015-07-20 23:36:32 +02:00
Christoph M. Becker
72b73e24a0 Fix #53156: imagerectangle problem with point ordering
Contrary to imagefilledrectangle(), imagerectangle() has the documented
limitation that the given points have to be the upper left and the lower right
corner, respectively. However, libgd already caters to upper right / lower left
pairs, and not catering to the other two combinations seems to be an oversight.
2015-07-20 02:14:29 +02:00
Christoph M. Becker
094decc3c0 Fix #53154: Zero-height rectangle has whiskers
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:33:00 +02:00
Christoph M. Becker
d87a3312e3 Fix #53154: Zero-height rectangle has whiskers
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
2015-07-13 01:29:01 +02:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Stanislav Malyshev
184b6d9e73 fix memory leak 2015-01-04 21:07:57 -08:00
Remi Collet
df4aaa81ef Fix Bug #68713 infinite loop / infinite free
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility

Apply:
3c0d2203b2
4af76c97a4
2015-01-03 08:34:27 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
c00424e427 bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
de426f7677 cleanup TSRMLS_FETCH in ext/gd 2014-09-26 21:34:22 +02:00
Christopher Jones
cd14de94d2 Reduce compiler noise by removing unused variables and labels 2013-08-14 21:06:59 -07:00
Pierre Joye
07e52857b5 fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:19:33 +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
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
Florian Anderiasch
be930868aa Fixed #60160 and added a test for it 2011-11-01 11:51:53 +00:00
Pierre Joye
ef76df031b - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +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
27d922c49f - WS 2010-04-28 08:04:52 +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
Pierre Joye
8f8220917e - Fix sanity check for the color index in imagecolortransparent 2009-09-03 09:45:56 +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
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
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
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
Takeshi Abe
3e3721be58 MFH: Fixed libgd #186 (Tiling true colour with palette image does not work) 2009-03-18 15:30:37 +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
Scott MacVicar
fdb9b62cef MFH Fix segfault and potential security issue in imagerotate(). 2008-12-10 13:32:02 +00:00
Rasmus Lerdorf
a3383ac3d7 Fix for bug #45030 2008-07-31 09:23:18 +00:00
Mattias Bengtsson
81a874710e -MFB, Fixed Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) 2007-11-04 23:56:41 +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
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