diff options
| author | Pierre Joye <pajoye@php.net> | 2007-08-27 08:27:45 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2007-08-27 08:27:45 +0000 |
| commit | 73fcf226277fb26924acabe4b3d16281a8748633 (patch) | |
| tree | 2a6203216a4dc120ce52cc46ded276b3b6e29440 | |
| parent | 0d98b9a1d992865e658043d1c66d6e5b92639ca0 (diff) | |
| download | php-git-73fcf226277fb26924acabe4b3d16281a8748633.tar.gz | |
- 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.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/gd/libgd/gd.c | 6 |
2 files changed, 2 insertions, 7 deletions
@@ -1,9 +1,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -- Fixed regression in imagerectangle for 1x1 rectangle (gd bug #106) (Pierre) 23 Aug 2007, PHP 5.2.4RC3 - Fixed version_compare() to support "rc" as well as "RC" for release candidate version numbers. +- Fixed possible crash in imagepsloadfont, work around a bug in the pslib on + windows (Pierre) - Fixed bug #42368 (Incorrect error message displayed by pg_escape_string). (Ilia) - Fixed bug #42365 (glob() crashes and/or accepts way too many flags). (Jani) diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 6e484adec5..301072f4e7 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -2124,12 +2124,6 @@ void gdImageRectangle (gdImagePtr im, int x1, int y1, int x2, int y2, int color) int half1 = 1; int t; - - if (x1 == x2 && y1 == y2 && thick == 1) { - gdImageSetPixel(im, x1, y1, color); - return; - } - if (y2 < y1) { t=y1; y1 = y2; |