diff options
| author | Pierre Joye <pajoye@php.net> | 2003-07-02 11:36:17 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2003-07-02 11:36:17 +0000 |
| commit | 119175c94372497ca63a33b7fcf9ad04bc4d60b9 (patch) | |
| tree | fad5deba0fda77470d6886c5743ca5b0a02c4f47 | |
| parent | 19f3c5b5fa1772df372b10eb4f6b93bf6026c080 (diff) | |
| download | php-git-119175c94372497ca63a33b7fcf9ad04bc4d60b9.tar.gz | |
- tabs
| -rw-r--r-- | ext/gd/libgd/gd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 769cca388e..5dce696113 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -2075,12 +2075,9 @@ void gdImageCopyMerge (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int s } else { dc = gdImageGetPixel(dst, tox, toy); - ncR = (int)gdImageRed (src, c) * (pct / 100.0) - + gdImageRed (dst, dc) * ((100 - pct) / 100.0); - ncG = (int)gdImageGreen (src, c) * (pct / 100.0) - + (int)gdImageGreen (dst, dc) * ((100 - pct) / 100.0); - ncB = (int)gdImageBlue (src, c) * (pct / 100.0) - + gdImageBlue (dst, dc) * ((100 - pct) / 100.0); + ncR = (int)gdImageRed (src, c) * (pct / 100.0) + gdImageRed (dst, dc) * ((100 - pct) / 100.0); + ncG = (int)gdImageGreen (src, c) * (pct / 100.0) + (int)gdImageGreen (dst, dc) * ((100 - pct) / 100.0); + ncB = (int)gdImageBlue (src, c) * (pct / 100.0) + gdImageBlue (dst, dc) * ((100 - pct) / 100.0); /* Find a reasonable color */ nc = gdImageColorResolve (dst, ncR, ncG, ncB); |