[poppler] Branch 'xpdf303merge' - poppler/GlobalParamsWin.cc poppler/SplashOutputDev.cc

[Albert Astals Cid]

 poppler/GlobalParamsWin.cc |    2 +-
 poppler/SplashOutputDev.cc |   10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 2b7ba166c28e32653db4ae7acf90e06e0dd5975b
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 8 19:12:52 2012 +0100

    [xpdf303] Compile fixes

diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
index 5ac1c60..c62e2cd 100644
--- a/poppler/GlobalParamsWin.cc
+++ b/poppler/GlobalParamsWin.cc
@@ -394,7 +394,7 @@ static char *findSubstituteName(const char *origName)
 /* Windows implementation of external font matching code */
 GooString *GlobalParams::findSystemFontFile(GfxFont *font,
 					  SysFontType *type,
-					  int *fontNum, , GooString * /*substituteFontName*/) {
+					  int *fontNum, GooString * /*substituteFontName*/) {
   SysFontInfo *fi;
   GooString *path = NULL;
   GooString *fontName = font->getName();
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 69e26a0..246a37d 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -3018,25 +3018,15 @@ void SplashOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
       break;
 #if SPLASH_CMYK
     case splashModeCMYK8:
-      grayIndexed = colorMap->getColorSpace()->getMode() != csDeviceGray;
       imgData.lookup = (SplashColorPtr)gmallocn(n, 4);
       for (i = 0; i < n; ++i) {
 	pix = (Guchar)i;
 	colorMap->getCMYK(&pix, &cmyk);
-	if (cmyk.c != 0 || cmyk.m != 0 || cmyk.y != 0) {
-	  grayIndexed = gFalse;
-	}
 	imgData.lookup[4*i] = colToByte(cmyk.c);
 	imgData.lookup[4*i+1] = colToByte(cmyk.m);
 	imgData.lookup[4*i+2] = colToByte(cmyk.y);
 	imgData.lookup[4*i+3] = colToByte(cmyk.k);
       }
-#ifndef USE_CMS
-	  if (colorMap->getColorSpace()->getMode() == csIndexed) {
-		  if (((GfxIndexedColorSpace *) colorMap->getColorSpace())->getBase()->getMode() == csICCBased)
-			  grayIndexed = gFalse;
-	  }
-#endif
       break;
 #endif
     }