rasmus Thu Jul 31 09:22:17 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/libgd gd.c gd_png.c
Log:
Fix for bug #45030
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.22&r2=1.90.2.1.2.23&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.22
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.23
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.22 Sun Nov 4 23:56:00 2007
+++ php-src/ext/gd/libgd/gd.c Thu Jul 31 09:22:17 2008
@@ -2620,6 +2620,7 @@
green /= spixels;
blue /= spixels;
alpha /= spixels;
+ alpha += 0.5;
}
if ( alpha_sum != 0.0f) {
if( contrib_sum != 0.0f) {
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_png.c?r1=1.17.4.2.2.5&r2=1.17.4.2.2.6&diff_format=u
Index: php-src/ext/gd/libgd/gd_png.c
diff -u php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5
php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.6
--- php-src/ext/gd/libgd/gd_png.c:1.17.4.2.2.5 Wed May 16 22:19:08 2007
+++ php-src/ext/gd/libgd/gd_png.c Thu Jul 31 09:22:17 2008
@@ -689,7 +689,12 @@
*/
a = gdTrueColorGetAlpha(thisPixel);
/* Andrew Hull: >> 6, not >> 7! (gd
2.0.5) */
- *pOutputRow++ = 255 - ((a << 1) + (a >>
6));
+ if (a == 127) {
+ *pOutputRow++ = 0;
+ } else {
+ *pOutputRow++ = 255 - ((a << 1)
+ (a >> 6));
+ }
+
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
