[poppler] 2 commits - poppler/SplashOutputDev.cc poppler/SplashOutputDev.h

[Albert Astals Cid]

 poppler/SplashOutputDev.cc |    9 ++-------
 poppler/SplashOutputDev.h  |    6 ++----
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 73130ae1125c86ebd0ee504d0681d9911ff2cfbd
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 14 17:40:23 2018 +0100

    SplashGouraudPattern: Remove mode member variable
    
    We don't need it anymore, was introduced in the initial overprint implementation and was forgotten to be removed when merging xpdf 3.03

diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 50b78245..efc0aaec 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -197,15 +197,10 @@ static inline void convertGfxShortColor(SplashColorPtr dest,
 // SplashGouraudPattern
 //------------------------------------------------------------------------
 SplashGouraudPattern::SplashGouraudPattern(GBool bDirectColorTranslationA,
-                                           GfxState *stateA, GfxGouraudTriangleShading *shadingA, SplashColorMode modeA) {
-  SplashColor defaultColor;
-  GfxColor srcColor;
+                                           GfxState *stateA, GfxGouraudTriangleShading *shadingA) {
   state = stateA;
   shading = shadingA;
-  mode = modeA;
   bDirectColorTranslation = bDirectColorTranslationA;
-  shadingA->getColorSpace()->getDefaultColor(&srcColor);
-  convertGfxColor(defaultColor, mode, shadingA->getColorSpace(), &srcColor);
   gfxMode = shadingA->getColorSpace()->getMode();
 }
 
@@ -4754,7 +4749,7 @@ GBool SplashOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTria
   }
   // restore vector antialias because we support it here
   if (shading->isParameterized()) {
-    SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading, colorMode);
+    SplashGouraudColor *splashShading = new SplashGouraudPattern(bDirectColorTranslation, state, shading);
     GBool vaa = getVectorAntialias();
     GBool retVal = gFalse;
     setVectorAntialias(gTrue);
diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h
index 4dc97e82..3a5883c4 100644
--- a/poppler/SplashOutputDev.h
+++ b/poppler/SplashOutputDev.h
@@ -135,9 +135,9 @@ private:
 class SplashGouraudPattern: public SplashGouraudColor {
 public:
 
-  SplashGouraudPattern(GBool bDirectColorTranslation, GfxState *state, GfxGouraudTriangleShading *shading, SplashColorMode mode);
+  SplashGouraudPattern(GBool bDirectColorTranslation, GfxState *state, GfxGouraudTriangleShading *shading);
 
-  SplashPattern *copy() override { return new SplashGouraudPattern(bDirectColorTranslation, state, shading, mode); }
+  SplashPattern *copy() override { return new SplashGouraudPattern(bDirectColorTranslation, state, shading); }
 
   ~SplashGouraudPattern();
 
@@ -162,7 +162,6 @@ private:
   GfxGouraudTriangleShading *shading;
   GfxState *state;
   GBool bDirectColorTranslation;
-  SplashColorMode mode;
   GfxColorSpaceMode gfxMode;
 };
 
commit 37efb98d77c14c27a22806ec676c13f0a8b99490
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 14 17:43:41 2018 +0100

    SplashOutputDev:: Remove unused maskBitmap member

diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h
index 89655d66..4dc97e82 100644
--- a/poppler/SplashOutputDev.h
+++ b/poppler/SplashOutputDev.h
@@ -466,7 +466,6 @@ private:
 
   SplashTransparencyGroup *	// transparency group stack
     transpGroupStack;
-  SplashBitmap *maskBitmap; // for image masks in pattern colorspace
   int nestCount;
 };