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

pajoye Fri Sep 30 17:05:04 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/gd/libgd gd.c Log: - MFH #33125, alpha emulation broken http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd.c?r1=1.24.2.36&r2=1.24.2.36.2.1&ty=u Index: php-src/ext/gd/libgd/gd.c diff -u php-src/ext/gd/libgd/gd.c:1.24.2.36 php-src/ext/gd/libgd/gd.c:1.24.2.36.2.1 --- php-src/ext/gd/libgd/gd.c:1.24.2.36 Sun May 1 01:45:55 2005 +++ php-src/ext/gd/libgd/gd.c Fri Sep 30 17:05:04 2005 @@ -2304,9 +2304,9 @@ dc = gdImageGetPixel(dst, tox, toy); g = (0.29900f * gdImageRed(dst, dc)) + (0.58700f * gdImageGreen(dst, dc)) + (0.11400f * gdImageBlue(dst, dc)); - ncR = (int)(gdImageRed (src, c) * (pct / 100.0f) + gdImageRed(dst, dc) * g * ((100 - pct) / 100.0f)); - ncG = (int)(gdImageGreen (src, c) * (pct / 100.0f) + gdImageGreen(dst, dc) * g * ((100 - pct) / 100.0f)); - ncB = (int)(gdImageBlue (src, c) * (pct / 100.0f) + gdImageBlue(dst, dc) * g * ((100 - pct) / 100.0f)); + ncR = (int)(gdImageRed (src, c) * (pct / 100.0f) + g * ((100 - pct) / 100.0)); + ncG = (int)(gdImageGreen (src, c) * (pct / 100.0f) + g * ((100 - pct) / 100.0)); + ncB = (int)(gdImageBlue (src, c) * (pct / 100.0f) + g * ((100 - pct) / 100.0)); /* First look for an exact match */ nc = gdImageColorExact(dst, ncR, ncG, ncB);