- 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.

diff --git a/NEWS b/NEWS
index c2a20b17b23213ab92114ae3f317a83f663c6503..6f3bf5f96e827ed845042a451edefb8101c36438 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 6e484adec5bcb3987baa9dde6c0ca6a972aeb8f9..301072f4e7c2ef373562e300a201ee3a3f09ff06 100644 (file)
--- 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;