cvs: php-src /ext/gd/libgd gd.c
| From: | Pierre-Alain Joye | Date: | Wed, 17 Nov 2004 20:19:35 +0000 |
| Subject: | cvs: php-src /ext/gd/libgd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29243@lists.php.net to get a copy of this message | ||
pajoye Wed Nov 17 15:19:35 2004 EDT
Modified files:
/php-src/ext/gd/libgd gd.c
Log:
- Really fix imagefill, part of my previous (old) fix was not applied
(blame me), bak the alphablending and restore it on exit
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.82&r2=1.83&ty=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.82 php-src/ext/gd/libgd/gd.c:1.83
--- php-src/ext/gd/libgd/gd.c:1.82 Wed Nov 17 12:21:22 2004
+++ php-src/ext/gd/libgd/gd.c Wed Nov 17 15:19:35 2004
@@ -1877,11 +1877,17 @@
int l, x1, x2, dy;
int oc; /* old pixel value */
int wx2,wy2;
+
+ int alphablending_bak;
+
/* stack of filled segments */
/* struct seg stack[FILL_MAX],*sp = stack;; */
struct seg *stack;
struct seg *sp;
+ alphablending_bak = im->alphaBlendingFlag;
+ im->alphaBlendingFlag = 0;
+
if (nc==gdTiled){
_gdImageFillTiled(im,x,y,nc);
return;
@@ -1932,6 +1938,7 @@
} while (x<=x2);
}
efree(stack);
+ im->alphaBlendingFlag = alphablending_bak;
}
void _gdImageFillTiled(gdImagePtr im, int x, int y, int nc)