cvs: php4(PHP_4_0_7) /ext/gd gd.c
| From: | Rasmus Lerdorf | Date: | Fri, 16 Nov 2001 12:02:33 +0000 |
| Subject: | cvs: php4(PHP_4_0_7) /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8224@lists.php.net to get a copy of this message | ||
rasmus Fri Nov 16 07:02:33 2001 EDT
Modified files: (Branch: PHP_4_0_7)
/php4/ext/gd gd.c
Log:
MFH
(I wish people would stop committing whitespace fixes to code that has
been around forever. It really makes merging and checking diffs a pain
in the ass as real changes end up hidden within a sea of useless
whitespace fixes)
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.154.2.9 php4/ext/gd/gd.c:1.154.2.10
--- php4/ext/gd/gd.c:1.154.2.9 Tue Nov 13 08:54:20 2001
+++ php4/ext/gd/gd.c Fri Nov 16 07:02:30 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.154.2.9 2001/11/13 13:54:20 rasmus Exp $ */
+/* $Id: gd.c,v 1.154.2.10 2001/11/16 12:02:30 rasmus Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1592,8 +1592,9 @@
#if HAVE_LIBGD20
if(gdImageTrueColor(im)) {
if (im->tpixels && gdImageBoundsSafe(im, Z_LVAL_PP(x), Z_LVAL_PP(y))) {
- RETURN_LONG(im->tpixels[Z_LVAL_PP(x)][Z_LVAL_PP(y)]);
+ RETURN_LONG(gdImageTrueColorPixel(im, Z_LVAL_PP(x), Z_LVAL_PP(y)));
} else {
+ php_error(E_NOTICE, "%ld,%ld is out of bounds",Z_LVAL_PP(x), Z_LVAL_PP(y));
RETURN_FALSE;
}
} else {
@@ -1605,6 +1606,7 @@
RETURN_LONG(im->pixels[Z_LVAL_PP(x)][Z_LVAL_PP(y)]);
#endif
} else {
+ php_error(E_NOTICE, "%ld,%ld is out of bounds",Z_LVAL_PP(x), Z_LVAL_PP(y));
RETURN_FALSE;
}
#if HAVE_LIBGD20