derick          Tue Mar  2 16:56:31 2004 EDT

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/gd/libgd       gd.c 
  Log:
  - Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
    x1 < x2 and y1 < y2 for coordinates.
  
  
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1622&r2=1.1623&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1622 php-src/NEWS:1.1623
--- php-src/NEWS:1.1622 Mon Mar  1 05:46:58 2004
+++ php-src/NEWS        Tue Mar  2 16:56:29 2004
@@ -11,6 +11,8 @@
 - Methods that override parent methods are now subject to prototype checking,
   and have to be compatible with the method they're overriding - this check is 
   disabled in compatibility mode. (Andi, Zeev)
+- Fixed bug in gdImageFilledRectangle in the bundled GD library, that required
+  x1 < x2 and y1 < y2 for coordinates. (Derick)
 - Fixed crash with foreach() and temporary objects($obj->method()->a ...) where
   method returns a non-referenced object. (Andi, Zeev)
 - Fixed problem preventing startup errors from being displayed. (Marcus)
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.70&r2=1.71&ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.70 php-src/ext/gd/libgd/gd.c:1.71
--- php-src/ext/gd/libgd/gd.c:1.70      Sat Jan 17 04:19:14 2004
+++ php-src/ext/gd/libgd/gd.c   Tue Mar  2 16:56:30 2004
@@ -2038,6 +2038,16 @@
        if (y1 > gdImageSY(im)) {
                y1 = gdImageSY(im);
        }
+       if (x1 > x2) {
+               x = x1;
+               x1 = x2;
+               x2 = x;
+       }
+       if (y1 > y2) {
+               y = y1;
+               y1 = y2;
+               y2 = y;
+       }
 
        for (y = y1; (y <= y2); y++) {
                for (x = x1; (x <= x2); x++) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to