From: Matthias Kramm <kramm@quiss.org>
Date: Sat, 7 Nov 2009 03:15:40 +0000 (-0800)
Subject: fixed image maskcolors
X-Git-Tag: version-0-9-1~247
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=8aeee6106e6d04d3ced2afff12c238eb38254123

fixed image maskcolors
---

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 881c75a..5949271 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -2393,38 +2393,18 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str,
       for(t=0;t<256;t++) {
 	  pixBuf[0] = t;
 	  colorMap->getRGB(pixBuf, &rgb);
-
-	  {/*if(maskColors && *maskColors==t) {
-	      msg("<notice> Color %d is transparent", t);
-	      if (imgData->maskColors) {
-		*alpha = 0;
-		for (i = 0; i < imgData->colorMap->getNumPixelComps(); ++i) {
-		  if (pix[i] < imgData->maskColors[2*i] ||
-		      pix[i] > imgData->maskColors[2*i+1]) {
-		    *alpha = 1;
-		    break;
-		  }
-		}
-	      } else {
-		*alpha = 1;
-	      }
-	      if(!*alpha) {
-		    pal[t].r = 0;
-		    pal[t].g = 0;
-		    pal[t].b = 0;
-		    pal[t].a = 0;
-	      }
-	  } else {*/
-	      pal[t].r = (unsigned char)(colToByte(rgb.r));
-	      pal[t].g = (unsigned char)(colToByte(rgb.g));
-	      pal[t].b = (unsigned char)(colToByte(rgb.b));
-	      pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5);
-	  }
+	  pal[t].r = (unsigned char)(colToByte(rgb.r));
+	  pal[t].g = (unsigned char)(colToByte(rgb.g));
+	  pal[t].b = (unsigned char)(colToByte(rgb.b));
+	  pal[t].a = 255;//(U8)(rgb.b * 255 + 0.5);
       }
       for (y = 0; y < height; ++y) {
 	for (x = 0; x < width; ++x) {
 	  imgStr->getPixel(pixBuf);
 	  pic[width*y+x] = pal[pixBuf[0]];
+	  if(maskColors && *maskColors==pixBuf[0]) {
+	      pic[width*y+x].a = 0;
+	  }
 	}
       }
       if(maskbitmap) {