[poppler] splash/Splash.cc splash/SplashFTFontEngine.cc splash/SplashXPath.cc

[Albert Astals Cid]

 splash/Splash.cc             |    5 ++---
 splash/SplashFTFontEngine.cc |    4 +---
 splash/SplashXPath.cc        |    6 ++----
 3 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit ce55510f4dd10dfec2fc5b1c211c4a546c6ebc98
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Apr 27 08:42:34 2011 +0100

    Remove unused vars

diff --git a/splash/Splash.cc b/splash/Splash.cc
index 5d65834..74f523c 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -11,7 +11,7 @@
 // All changes made under the Poppler project to this file are licensed
 // under GPL version 2 or later
 //
-// Copyright (C) 2005-2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2011 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
 // Copyright (C) 2010, 2011 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
@@ -3220,7 +3220,7 @@ GBool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading)
 
   int scanLineOff = 0;
   int bitmapOff = 0;
-  int scanLimitR = 0, scanLimitL = 0, Yt = 0;
+  int scanLimitR = 0, scanLimitL = 0;
 
   int bitmapWidth = bitmap->getWidth();
   SplashClip* clip = getClip();
@@ -3400,7 +3400,6 @@ GBool Splash::gouraudTriangleShadedFill(SplashGouraudColor *shading)
       scanColorMapR[0] = (color[scanEdgeR[1]] - color[scanEdgeR[0]]) / (y[scanEdgeR[1]] - y[scanEdgeR[0]]);
       scanColorMapR[1] = color[scanEdgeR[0]] - y[scanEdgeR[0]] * scanColorMapR[0];
 
-      Yt = y[2];
       hasFurtherSegment = (y[1] < y[2]);
       scanLineOff = y[0] * rowSize;
 
diff --git a/splash/SplashFTFontEngine.cc b/splash/SplashFTFontEngine.cc
index 61a92cc..144f8f4 100644
--- a/splash/SplashFTFontEngine.cc
+++ b/splash/SplashFTFontEngine.cc
@@ -12,7 +12,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
-// Copyright (C) 2009 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009, 2011 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Petr Gajdos <pgajdos at novell.com>
 // Copyright (C) 2011 Andreas Hartmetz <ahartmetz at gmail.com>
 //
@@ -141,14 +141,12 @@ SplashFontFile *SplashFTFontEngine::loadCIDFont(SplashFontFileID *idA,
 SplashFontFile *SplashFTFontEngine::loadOpenTypeCFFFont(SplashFontFileID *idA,
 							SplashFontSrc *src) {
   FoFiTrueType *ff;
-  GBool isCID;
   Gushort *cidToGIDMap;
   int nCIDs;
   SplashFontFile *ret;
 
   cidToGIDMap = NULL;
   nCIDs = 0;
-  isCID = gFalse;
   if (!useCIDs) {
     if (src->isFile) {
       ff = FoFiTrueType::load(src->fileName->getCString());
diff --git a/splash/SplashXPath.cc b/splash/SplashXPath.cc
index d558935..a896323 100644
--- a/splash/SplashXPath.cc
+++ b/splash/SplashXPath.cc
@@ -12,7 +12,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2010 Paweł Wiejacha <pawel.wiejacha at gmail.com>
-// Copyright (C) 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2010, 2011 Albert Astals Cid <aacid at kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -78,7 +78,7 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix,
   SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xsp, ysp;
   SplashCoord adj0, adj1, w;
   int ww;
-  int curSubpath, curSubpathX, i, j;
+  int curSubpath, i, j;
 
   // transform the points
   pts = (SplashXPathPoint *)gmallocn(path->length, sizeof(SplashXPathPoint));
@@ -157,7 +157,6 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix,
   x0 = y0 = xsp = ysp = 0; // make gcc happy
   adj0 = adj1 = 0; // make gcc happy
   curSubpath = 0;
-  curSubpathX = 0;
   i = 0;
   while (i < path->length) {
 
@@ -168,7 +167,6 @@ SplashXPath::SplashXPath(SplashPath *path, SplashCoord *matrix,
       xsp = x0;
       ysp = y0;
       curSubpath = i;
-      curSubpathX = length;
       ++i;
 
     } else {