[PHP-CVS] cvs: php4(PHP_4_3) /ext/gd/libgd gd.c

[Ilia Alshanetsky]

iliaa           Wed Jun  4 10:58:33 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/gd/libgd  gd.c 
  Log:
  MFH (dupe macro)
  
  
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.24.2.12 php4/ext/gd/libgd/gd.c:1.24.2.13
--- php4/ext/gd/libgd/gd.c:1.24.2.12    Wed Jun  4 01:30:45 2003
+++ php4/ext/gd/libgd/gd.c      Wed Jun  4 10:58:33 2003
@@ -7,9 +7,6 @@
 
 #include "php.h"
 
-/* 2.0.12: this now checks the clipping rectangle */
-#define gdImageBoundsSafeMacro(im, x, y) (!((((y) < (im)->cy1) || ((y) > (im)->cy2)) 
|| (((x) < (im)->cx1) || ((x) > (im)->cx2))))
-
 #ifdef _MSC_VER
 # if _MSC_VER >= 1300
 /* in MSVC.NET the these are available but only for __cplusplus and not 
_MSC_EXTENSIONS */
@@ -895,7 +892,7 @@
         * 2.0.14: typo fixed. 2.0.15: moved down below declarations
         * to satisfy non-C++ compilers.
         */
-       if (!gdImageBoundsSafeMacro(im, px, py)) {
+       if (!gdImageBoundsSafe(im, px, py)) {
                return;
        }
 



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