From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 16 Nov 2001 11:59:04 +0000 (+0000)
Subject: Use the macro here and add an E_NOTICE
X-Git-Tag: ChangeLog~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e68a9c6bfa987a26aa4f649d93db6e6a4b92caba;p=php

Use the macro here and add an E_NOTICE
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ff7ebccd29..4c75b2a08c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1592,8 +1592,9 @@ PHP_FUNCTION(imagecolorat)
 #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 @@ PHP_FUNCTION(imagecolorat)
 			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