From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 25 Feb 2003 03:53:22 +0000 (+0000)
Subject: MFH (fix for crash in gdImageCopyMergeGray()).
X-Git-Tag: php-4.3.2RC1~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d140e99210f728a10ea7715c6edf09a724d823;p=php

MFH (fix for crash in gdImageCopyMergeGray()).
---

diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index 3292caaeb7..0c4d307596 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -2000,9 +2000,7 @@ gdImageCopyMergeGray (gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int sr
 	  else
 	    {
 	      dc = gdImageGetPixel (dst, tox, toy);
-	      g = 0.29900f * dst->red[dc]
-	        + 0.58700f * dst->green[dc]
-	        + 0.11400f * dst->blue[dc];
+	      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));