pajoye Wed Nov 17 12:13:42 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/gd/libgd gd.c
Log:
- Fix #30739, imagefill does not set back the alphablending mode
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.753&r2=1.1247.2.754&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.753 php-src/NEWS:1.1247.2.754
--- php-src/NEWS:1.1247.2.753 Mon Nov 15 08:40:28 2004
+++ php-src/NEWS Wed Nov 17 12:13:41 2004
@@ -8,6 +8,7 @@
- Fixed potential problems with unserializing invalid serialize data. (Marcus)
- Fixed bug #30750 (Meaningful error message when upload directory is not
accessible). (Ilia)
+- Fixed bug #30739 (imagefill does not set back alphablending mode) (Pierre)
- Fixed bug #30672 (Problem handling exif data in jpeg images at unusual
places). (Marcus)
- Fixed bug #30658 (Ensure that temporary files created by GD are removed).
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.24.2.33&r2=1.24.2.34&ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.24.2.33 php-src/ext/gd/libgd/gd.c:1.24.2.34
--- php-src/ext/gd/libgd/gd.c:1.24.2.33 Sat Jul 3 11:32:33 2004
+++ php-src/ext/gd/libgd/gd.c Wed Nov 17 12:13:42 2004
@@ -1896,8 +1896,11 @@
wx2=im->sx;wy2=im->sy;
oc = gdImageGetPixel(im, x, y);
- if (oc==nc || x<0 || x>wx2 || y<0 || y>wy2) return;
-
+ if (oc==nc || x<0 || x>wx2 || y<0 || y>wy2) {
+ im->alphaBlendingFlag = alphablending_bak;
+ return;
+ }
+
stack = (struct seg *)emalloc(sizeof(struct seg) *
((int)(im->sy*im->sx)/4)+1);
sp = stack;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
