diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-21 17:40:45 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-21 17:45:49 +0200 |
| commit | 4c68fc5392f176434ebadb80cf451498009cc62a (patch) | |
| tree | 47a3948b2cadc017e9ef3c71c1b9fbaf9e45b0cf /ext/gd/libgd | |
| parent | 7a36056d6c087df2cb21f5ba9c342d780472a5f6 (diff) | |
| parent | d65adac2be2c9b32d9ad9bd00399c99d492502f5 (diff) | |
| download | php-git-4c68fc5392f176434ebadb80cf451498009cc62a.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/gd/libgd')
| -rw-r--r-- | ext/gd/libgd/gd.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c index 3ad51ada4b..928fdb89ca 100644 --- a/ext/gd/libgd/gd.c +++ b/ext/gd/libgd/gd.c @@ -2264,26 +2264,6 @@ void gdImageCopy (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, return; } - /* Destination is palette based */ - if (src->trueColor) { /* But source is truecolor (Ouch!) */ - toy = dstY; - for (y = srcY; (y < (srcY + h)); y++) { - tox = dstX; - for (x = srcX; x < (srcX + w); x++) { - int nc; - c = gdImageGetPixel (src, x, y); - - /* Get best match possible. */ - nc = gdImageColorResolveAlpha(dst, gdTrueColorGetRed(c), gdTrueColorGetGreen(c), gdTrueColorGetBlue(c), gdTrueColorGetAlpha(c)); - - gdImageSetPixel(dst, tox, toy, nc); - tox++; - } - toy++; - } - return; - } - /* Palette based to palette based */ for (i = 0; i < gdMaxColors; i++) { colorMap[i] = (-1); |