cvs: gd /libgd ISSUES gd.c
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1167855916@cvsserver> |
pajoye Wed Jan 3 20:25:16 2007 UTC
Modified files:
/gd/libgd gd.c ISSUES
Log:
#20, Fixed gdImageCopyMergeGray when used with a true color image
http://cvs.php.net/viewvc.cgi/gd/libgd/gd.c?r1=1.39&r2=1.40&diff_format=u
Index: gd/libgd/gd.c
diff -u gd/libgd/gd.c:1.39 gd/libgd/gd.c:1.40
--- gd/libgd/gd.c:1.39 Wed Jan 3 20:18:11 2007
+++ gd/libgd/gd.c Wed Jan 3 20:25:16 2007
@@ -1,4 +1,4 @@
-/* $Id: gd.c,v 1.39 2007/01/03 20:18:11 pajoye Exp $ */
+/* $Id: gd.c,v 1.40 2007/01/03 20:25:16 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -2221,8 +2221,8 @@
else
{
dc = gdImageGetPixel (dst, tox, toy);
- g = 0.29900 * dst->red[dc]
- + 0.58700 * dst->green[dc] + 0.11400 * dst->blue[dc];
+ g = 0.29900 * gdImageRed(dst, dc)
+ + 0.58700 * gdImageGreen(dst, dc) + 0.11400 * gdImageBlue(dst, dc);
ncR = gdImageRed (src, c) * (pct / 100.0)
+ g * ((100 - pct) / 100.0);
http://cvs.php.net/viewvc.cgi/gd/libgd/ISSUES?r1=1.18&r2=1.19&diff_format=u
Index: gd/libgd/ISSUES
diff -u gd/libgd/ISSUES:1.18 gd/libgd/ISSUES:1.19
--- gd/libgd/ISSUES:1.18 Wed Jan 3 20:18:11 2007
+++ gd/libgd/ISSUES Wed Jan 3 20:25:16 2007
@@ -41,3 +41,4 @@
compiler problem on Suns (John Ellson/Graphviz)
#18, Removed invalid gdFree call when overflow2 fails
#19, Use abs instead of fbas in HWB_Diff (Nick Atty)
+#20, Fixed gdImageCopyMergeGray when used with a true color image