cvs: php4 /ext/gd/libgd gd.c
| From: | Ilia Alshanetsky | Date: | Wed, 04 Jun 2003 14:58:20 +0000 |
| Subject: | cvs: php4 /ext/gd/libgd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21523@lists.php.net to get a copy of this message | ||
iliaa Wed Jun 4 10:58:20 2003 EDT
Modified files:
/php4/ext/gd/libgd gd.c
Log:
No need to dupe macro
Index: php4/ext/gd/libgd/gd.c
diff -u php4/ext/gd/libgd/gd.c:1.53 php4/ext/gd/libgd/gd.c:1.54
--- php4/ext/gd/libgd/gd.c:1.53 Wed Jun 4 01:32:03 2003
+++ php4/ext/gd/libgd/gd.c Wed Jun 4 10:58:20 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;
}