cvs: php-src(PHP_5_2) /ext/gd/libgd gd.c

kalle Mon Jun 22 15:51:13 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/gd/libgd gd.c Log: MFH: Use correct data types here, and gdImageSaveAlpha for the alpha flag http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.26&r2=1.90.2.1.2.27&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.26 php-src/ext/gd/libgd/gd.c:1.90.2.1.2.27 --- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.26 Thu Apr 23 16:28:39 2009 +++ php-src/ext/gd/libgd/gd.c Mon Jun 22 15:51:12 2009 @@ -3864,7 +3864,7 @@ int x, y, i, j, new_a; float new_r, new_g, new_b; int new_pxl, pxl=0; - gdImagePtr srcback, srctrans; + gdImagePtr srcback; typedef int (*FuncPtr)(gdImagePtr, int, int); FuncPtr f; @@ -3878,8 +3878,8 @@ return 0; } srcback->saveAlphaFlag = 1; - srctrans = gdImageColorAllocateAlpha(srcback, 0, 0, 0, 127); - gdImageFill(srcback, 0, 0, srctrans); + new_pxl = gdImageColorAllocateAlpha(srcback, 0, 0, 0, 127); + gdImageFill(srcback, 0, 0, new_pxl; gdImageCopy(srcback, src,0,0,0,0,src->sx,src->sy);