pajoye Tue Jul 7 10:49:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd/libgd gd.c
Log:
- #45905, imagefilledrectangle() clipping error
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.21.2.13&r2=1.90.2.1.2.21.2.14&diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.13
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.14
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.21.2.13 Wed May 27 07:17:54 2009
+++ php-src/ext/gd/libgd/gd.c Tue Jul 7 10:49:38 2009
@@ -2114,33 +2114,40 @@
{
int x, y;
- /* Nick Atty: limit the points at the edge. Note that this also
- * nicely kills any plotting for rectangles completely outside the
- * window as it makes the tests in the for loops fail
- */
- if (x1 < 0) {
- x1 = 0;
- }
- if (x1 > gdImageSX(im)) {
- x1 = gdImageSX(im);
- }
- if(y1 < 0) {
- y1 = 0;
- }
- if (y1 > gdImageSY(im)) {
- y1 = gdImageSY(im);
+
+ if (x1 == x2 && y1 == y2) {
+ gdImageSetPixel(im, x1, y1, color);
+ return;
}
+
if (x1 > x2) {
x = x1;
x1 = x2;
x2 = x;
}
+
if (y1 > y2) {
y = y1;
y1 = y2;
y2 = y;
}
+ if (x1 < 0) {
+ x1 = 0;
+ }
+
+ if (x2 >= gdImageSX(im)) {
+ x2 = gdImageSX(im) - 1;
+ }
+
+ if (y1 < 0) {
+ y1 = 0;
+ }
+
+ if (y2 >= gdImageSY(im)) {
+ y2 = gdImageSY(im) - 1;
+ }
+
for (y = y1; (y <= y2); y++) {
for (x = x1; (x <= x2); x++) {
gdImageSetPixel (im, x, y, color);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
