26 files changed, 27 insertions, 763 deletions

diff --git a/kpdf/xpdf/splash/CMakeLists.txt b/kpdf/xpdf/splash/CMakeLists.txt
index a7573b6c..a99ceeb2 100644
--- a/kpdf/xpdf/splash/CMakeLists.txt
+++ b/kpdf/xpdf/splash/CMakeLists.txt
@@ -23,10 +23,10 @@ include_directories(
 
 tde_add_library( splash STATIC_PIC
   SOURCES
-    Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc
-    SplashFTFontEngine.cc SplashFTFontFile.cc SplashFont.cc
-    SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc
-    SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc
-    SplashT1Font.cc SplashT1FontEngine.cc SplashT1FontFile.cc
-    SplashXPath.cc SplashXPathScanner.cc
+    Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp
+    SplashFTFontEngine.cpp SplashFTFontFile.cpp SplashFont.cpp
+    SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp
+    SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp
+    SplashXPath.cpp SplashXPathScanner.cpp
+  LINK ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
 )
diff --git a/kpdf/xpdf/splash/Makefile.am b/kpdf/xpdf/splash/Makefile.am
index 34d41419..5bf50df6 100644
--- a/kpdf/xpdf/splash/Makefile.am
+++ b/kpdf/xpdf/splash/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(USER_INCLUDES)
 
-libsplash_la_SOURCES = Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc SplashFTFontEngine.cc \
-	SplashFTFontFile.cc SplashFont.cc SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc \
-	SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc SplashT1Font.cc \
-	SplashT1FontEngine.cc SplashT1FontFile.cc SplashXPath.cc SplashXPathScanner.cc
+libsplash_la_SOURCES = Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp SplashFTFontEngine.cpp \
+	SplashFTFontFile.cpp SplashFont.cpp SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp \
+	SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp \
+	SplashXPath.cpp SplashXPathScanner.cpp
 
 noinst_LTLIBRARIES = libsplash.la
diff --git a/kpdf/xpdf/splash/Splash.cc b/kpdf/xpdf/splash/Splash.cpp
index 2b91e4e7..2cfc1ee2 100644
--- a/kpdf/xpdf/splash/Splash.cc
+++ b/kpdf/xpdf/splash/Splash.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Splash.cc
+// Splash.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashBitmap.cc b/kpdf/xpdf/splash/SplashBitmap.cpp
index 62bbd8e8..5b5d28d1 100644
--- a/kpdf/xpdf/splash/SplashBitmap.cc
+++ b/kpdf/xpdf/splash/SplashBitmap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashBitmap.cc
+// SplashBitmap.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashClip.cc b/kpdf/xpdf/splash/SplashClip.cpp
index ef8acbab..ba03b7a4 100644
--- a/kpdf/xpdf/splash/SplashClip.cc
+++ b/kpdf/xpdf/splash/SplashClip.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashClip.cc
+// SplashClip.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFont.cc b/kpdf/xpdf/splash/SplashFTFont.cpp
index 42d92af4..4bc31210 100644
--- a/kpdf/xpdf/splash/SplashFTFont.cc
+++ b/kpdf/xpdf/splash/SplashFTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFont.cc
+// SplashFTFont.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFontEngine.cc b/kpdf/xpdf/splash/SplashFTFontEngine.cpp
index 02996de7..36cf32e6 100644
--- a/kpdf/xpdf/splash/SplashFTFontEngine.cc
+++ b/kpdf/xpdf/splash/SplashFTFontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFontEngine.cc
+// SplashFTFontEngine.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFontFile.cc b/kpdf/xpdf/splash/SplashFTFontFile.cpp
index 12725497..697c3ed8 100644
--- a/kpdf/xpdf/splash/SplashFTFontFile.cc
+++ b/kpdf/xpdf/splash/SplashFTFontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFontFile.cc
+// SplashFTFontFile.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFont.cc b/kpdf/xpdf/splash/SplashFont.cpp
index 4a91d5e8..42c9e999 100644
--- a/kpdf/xpdf/splash/SplashFont.cc
+++ b/kpdf/xpdf/splash/SplashFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFont.cc
+// SplashFont.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFontEngine.cc b/kpdf/xpdf/splash/SplashFontEngine.cpp
index 4dc1b35b..c3eb33a7 100644
--- a/kpdf/xpdf/splash/SplashFontEngine.cc
+++ b/kpdf/xpdf/splash/SplashFontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontEngine.cc
+// SplashFontEngine.cpp
 //
 //========================================================================
 
@@ -10,10 +10,6 @@
 #pragma implementation
 #endif
 
-#if HAVE_T1LIB_H
-#include <t1lib.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #ifndef WIN32
@@ -22,7 +18,6 @@
 #include "gmem.h"
 #include "GString.h"
 #include "SplashMath.h"
-#include "SplashT1FontEngine.h"
 #include "SplashFTFontEngine.h"
 #include "SplashFontFile.h"
 #include "SplashFontFileID.h"
@@ -40,9 +35,6 @@ extern "C" int unlink(char *filename);
 //------------------------------------------------------------------------
 
 SplashFontEngine::SplashFontEngine(
-#if HAVE_T1LIB_H
-				   GBool enableT1lib,
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 				   GBool enableFreeType,
 #endif
@@ -53,13 +45,6 @@ SplashFontEngine::SplashFontEngine(
     fontCache[i] = NULL;
   }
 
-#if HAVE_T1LIB_H
-  if (enableT1lib) {
-    t1Engine = SplashT1FontEngine::init(aa);
-  } else {
-    t1Engine = NULL;
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (enableFreeType) {
     ftEngine = SplashFTFontEngine::init(aa);
@@ -78,11 +63,6 @@ SplashFontEngine::~SplashFontEngine() {
     }
   }
 
-#if HAVE_T1LIB_H
-  if (t1Engine) {
-    delete t1Engine;
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (ftEngine) {
     delete ftEngine;
@@ -111,11 +91,6 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA,
   SplashFontFile *fontFile;
 
   fontFile = NULL;
-#if HAVE_T1LIB_H
-  if (!fontFile && t1Engine) {
-    fontFile = t1Engine->loadType1Font(idA, src, enc);
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (!fontFile && ftEngine) {
     fontFile = ftEngine->loadType1Font(idA, src, enc);
@@ -138,11 +113,6 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
   SplashFontFile *fontFile;
 
   fontFile = NULL;
-#if HAVE_T1LIB_H
-  if (!fontFile && t1Engine) {
-    fontFile = t1Engine->loadType1CFont(idA, sec, enc);
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (!fontFile && ftEngine) {
     fontFile = ftEngine->loadType1CFont(idA, src, enc);
diff --git a/kpdf/xpdf/splash/SplashFontEngine.h b/kpdf/xpdf/splash/SplashFontEngine.h
index ace5e9ae..4718a208 100644
--- a/kpdf/xpdf/splash/SplashFontEngine.h
+++ b/kpdf/xpdf/splash/SplashFontEngine.h
@@ -15,7 +15,6 @@
 
 #include "gtypes.h"
 
-class SplashT1FontEngine;
 class SplashFTFontEngine;
 class SplashDTFontEngine;
 class SplashDT4FontEngine;
@@ -37,9 +36,6 @@ public:
 
   // Create a font engine.
   SplashFontEngine(
-#if HAVE_T1LIB_H
-		   GBool enableT1lib,
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 		   GBool enableFreeType,
 #endif
@@ -75,9 +71,6 @@ private:
 
   SplashFont *fontCache[splashFontCacheSize];
 
-#if HAVE_T1LIB_H
-  SplashT1FontEngine *t1Engine;
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   SplashFTFontEngine *ftEngine;
 #endif
diff --git a/kpdf/xpdf/splash/SplashFontFile.cc b/kpdf/xpdf/splash/SplashFontFile.cpp
index ad58c22d..c66447bb 100644
--- a/kpdf/xpdf/splash/SplashFontFile.cc
+++ b/kpdf/xpdf/splash/SplashFontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontFile.cc
+// SplashFontFile.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFontFileID.cc b/kpdf/xpdf/splash/SplashFontFileID.cpp
index af37cb2f..9182d4d8 100644
--- a/kpdf/xpdf/splash/SplashFontFileID.cc
+++ b/kpdf/xpdf/splash/SplashFontFileID.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontFileID.cc
+// SplashFontFileID.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashPath.cc b/kpdf/xpdf/splash/SplashPath.cpp
index e3a89271..4a3c334c 100644
--- a/kpdf/xpdf/splash/SplashPath.cc
+++ b/kpdf/xpdf/splash/SplashPath.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashPath.cc
+// SplashPath.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashPattern.cc b/kpdf/xpdf/splash/SplashPattern.cpp
index e6a37852..2aa4f70f 100644
--- a/kpdf/xpdf/splash/SplashPattern.cc
+++ b/kpdf/xpdf/splash/SplashPattern.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashPattern.cc
+// SplashPattern.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashScreen.cc b/kpdf/xpdf/splash/SplashScreen.cpp
index 3e8d36ca..a1f50c0a 100644
--- a/kpdf/xpdf/splash/SplashScreen.cc
+++ b/kpdf/xpdf/splash/SplashScreen.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashScreen.cc
+// SplashScreen.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashState.cc b/kpdf/xpdf/splash/SplashState.cpp
index e2c34c44..17445ad7 100644
--- a/kpdf/xpdf/splash/SplashState.cc
+++ b/kpdf/xpdf/splash/SplashState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashState.cc
+// SplashState.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashT1Font.cc b/kpdf/xpdf/splash/SplashT1Font.cc
deleted file mode 100644
index 19237e1d..00000000
--- a/kpdf/xpdf/splash/SplashT1Font.cc
+++ /dev/null
@@ -1,292 +0,0 @@
-//========================================================================
-//
-// SplashT1Font.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <stdlib.h>
-#include <t1lib.h>
-#include "gmem.h"
-#include "SplashMath.h"
-#include "SplashGlyphBitmap.h"
-#include "SplashPath.h"
-#include "SplashT1FontEngine.h"
-#include "SplashT1FontFile.h"
-#include "SplashT1Font.h"
-
-//------------------------------------------------------------------------
-
-static Guchar bitReverse[256] = {
-  0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-  0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-  0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-  0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-  0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-  0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-  0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-  0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-  0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-  0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-  0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-  0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-  0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-  0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-  0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-  0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-  0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-  0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-  0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-  0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-  0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-  0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-  0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-  0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-  0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-  0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-  0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-  0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-  0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-  0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-  0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-  0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-
-//------------------------------------------------------------------------
-// SplashT1Font
-//------------------------------------------------------------------------
-
-SplashT1Font::SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA,
-			   SplashCoord *textMatA):
-  SplashFont(fontFileA, matA, textMatA, fontFileA->engine->aa)
-{
-  T1_TMATRIX matrix;
-  BBox bbox;
-  SplashCoord bbx0, bby0, bbx1, bby1;
-  int x, y;
-
-  t1libID = T1_CopyFont(fontFileA->t1libID);
-  outlineID = -1;
-
-  // compute font size
-  size = (float)splashSqrt(mat[2]*mat[2] + mat[3]*mat[3]);
-
-  // transform the four corners of the font bounding box -- the min
-  // and max values form the bounding box of the transformed font
-  bbox = T1_GetFontBBox(t1libID);
-  bbx0 = 0.001 * bbox.llx;
-  bby0 = 0.001 * bbox.lly;
-  bbx1 = 0.001 * bbox.urx;
-  bby1 = 0.001 * bbox.ury;
-  // some fonts are completely broken, so we fake it (with values
-  // large enough that most glyphs should fit)
-  if (bbx0 == 0 && bby0 == 0 && bbx1 == 0 && bby1 == 0) {
-    bbx0 = bby0 = -0.5;
-    bbx1 = bby1 = 1.5;
-  }
-  x = (int)(mat[0] * bbx0 + mat[2] * bby0);
-  xMin = xMax = x;
-  y = (int)(mat[1] * bbx0 + mat[3] * bby0);
-  yMin = yMax = y;
-  x = (int)(mat[0] * bbx0 + mat[2] * bby1);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx0 + mat[3] * bby1);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  x = (int)(mat[0] * bbx1 + mat[2] * bby0);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx1 + mat[3] * bby0);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  x = (int)(mat[0] * bbx1 + mat[2] * bby1);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx1 + mat[3] * bby1);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  // This is a kludge: some buggy PDF generators embed fonts with
-  // zero bounding boxes.
-  if (xMax == xMin) {
-    xMin = 0;
-    xMax = (int)size;
-  }
-  if (yMax == yMin) {
-    yMin = 0;
-    yMax = (int)(1.2 * size);
-  }
-  // Another kludge: an unusually large xMin or yMin coordinate is
-  // probably wrong.
-  if (xMin > 0) {
-    xMin = 0;
-  }
-  if (yMin > 0) {
-    yMin = 0;
-  }
-  // Another kludge: t1lib doesn't correctly handle fonts with
-  // real (non-integer) bounding box coordinates.
-  if (xMax - xMin > 5000) {
-    xMin = 0;
-    xMax = (int)size;
-  }
-  if (yMax - yMin > 5000) {
-    yMin = 0;
-    yMax = (int)(1.2 * size);
-  }
-
-  // transform the font
-  matrix.cxx = (double)mat[0] / size;
-  matrix.cxy = (double)mat[1] / size;
-  matrix.cyx = (double)mat[2] / size;
-  matrix.cyy = (double)mat[3] / size;
-  T1_TransformFont(t1libID, &matrix);
-}
-
-SplashT1Font::~SplashT1Font() {
-  T1_DeleteFont(t1libID);
-  if (outlineID >= 0) {
-    T1_DeleteFont(outlineID);
-  }
-}
-
-GBool SplashT1Font::getGlyph(int c, int xFrac, int yFrac,
-			     SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) {
-  return SplashFont::getGlyph(c, 0, 0, bitmap, x0, y0, clip, clipRes);
-}
-
-GBool SplashT1Font::makeGlyph(int c, int xFrac, int yFrac,
-			      SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) {
-  GLYPH *glyph;
-  int n, i;
-
-  if (aa) {
-    glyph = T1_AASetChar(t1libID, c, size, NULL);
-  } else {
-    glyph = T1_SetChar(t1libID, c, size, NULL);
-  }
-  if (!glyph) {
-    return gFalse;
-  }
-
-  bitmap->x = -glyph->metrics.leftSideBearing;
-  bitmap->y = glyph->metrics.ascent;
-  bitmap->w = glyph->metrics.rightSideBearing - glyph->metrics.leftSideBearing;
-  bitmap->h = glyph->metrics.ascent - glyph->metrics.descent;
-  bitmap->aa = aa;
-  if (aa) {
-    bitmap->data = (Guchar *)glyph->bits;
-    bitmap->freeData = gFalse;
-  } else {
-    n = bitmap->h * ((bitmap->w + 7) >> 3);
-    bitmap->data = (Guchar *)gmalloc(n);
-    for (i = 0; i < n; ++i) {
-      bitmap->data[i] = bitReverse[glyph->bits[i] & 0xff];
-    }
-    bitmap->freeData = gTrue;
-  }
-
-  *clipRes = clip->testRect(x0 - bitmap->x,
-                            y0 - bitmap->y,
-                            x0 - bitmap->x + bitmap->w - 1,
-                            y0 - bitmap->y + bitmap->h - 1);
-
-  return gTrue;
-}
-
-SplashPath *SplashT1Font::getGlyphPath(int c) {
-  T1_TMATRIX matrix;
-  SplashPath *path;
-  T1_OUTLINE *outline;
-  T1_PATHSEGMENT *seg;
-  T1_BEZIERSEGMENT *bez;
-  SplashCoord x, y, x1, y1;
-  GBool needClose;
-
-  if (outlineID < 0) {
-    outlineID = T1_CopyFont(((SplashT1FontFile *)fontFile)->t1libID);
-    outlineSize = (float)splashSqrt(textMat[2]*textMat[2] +
-				    textMat[3]*textMat[3]);
-    matrix.cxx = (double)textMat[0] / outlineSize;
-    matrix.cxy = (double)textMat[1] / outlineSize;
-    matrix.cyx = (double)textMat[2] / outlineSize;
-    matrix.cyy = (double)textMat[3] / outlineSize;
-    // t1lib doesn't seem to handle small sizes correctly here, so set
-    // the size to 1000, and scale the resulting coordinates later
-    outlineMul = (float)(outlineSize / 65536000.0);
-    outlineSize = 1000;
-    T1_TransformFont(outlineID, &matrix);
-  }
-
-  path = new SplashPath();
-  if ((outline = T1_GetCharOutline(outlineID, c, outlineSize, NULL))) {
-    x = 0;
-    y = 0;
-    needClose = gFalse;
-    for (seg = outline; seg; seg = seg->link) {
-      switch (seg->type) {
-      case T1_PATHTYPE_MOVE:
-	if (needClose) {
-	  path->close();
-	  needClose = gFalse;
-	}
-	x += seg->dest.x * outlineMul;
-	y += seg->dest.y * outlineMul;
-	path->moveTo(x, -y);
-	break;
-      case T1_PATHTYPE_LINE:
-	x += seg->dest.x * outlineMul;
-	y += seg->dest.y * outlineMul;
-	path->lineTo(x, -y);
-	needClose = gTrue;
-	break;
-      case T1_PATHTYPE_BEZIER:
-	bez = (T1_BEZIERSEGMENT *)seg;
-	x1 = x + (SplashCoord)(bez->dest.x * outlineMul);
-	y1 = y + (SplashCoord)(bez->dest.y * outlineMul);
-	path->curveTo(x + (SplashCoord)(bez->B.x * outlineMul),
-		      -(y + (SplashCoord)(bez->B.y * outlineMul)),
-		      x + (SplashCoord)(bez->C.x * outlineMul),
-		      -(y + (SplashCoord)(bez->C.y * outlineMul)),
-		      x1, -y1);
-	x = x1;
-	y = y1;
-	needClose = gTrue;
-	break;
-      }
-    }
-    if (needClose) {
-      path->close();
-    }
-    T1_FreeOutline(outline);
-  }
-
-  return path;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1Font.h b/kpdf/xpdf/splash/SplashT1Font.h
deleted file mode 100644
index 129c6ad5..00000000
--- a/kpdf/xpdf/splash/SplashT1Font.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//========================================================================
-//
-// SplashT1Font.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONT_H
-#define SPLASHT1FONT_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "SplashFont.h"
-
-class SplashT1FontFile;
-
-//------------------------------------------------------------------------
-// SplashT1Font
-//------------------------------------------------------------------------
-
-class SplashT1Font: public SplashFont {
-public:
-
-  SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA,
-	       SplashCoord *textMatA);
-
-  virtual ~SplashT1Font();
-
-  // Munge xFrac and yFrac before calling SplashFont::getGlyph.
-  virtual GBool getGlyph(int c, int xFrac, int yFrac,
-			 SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
-
-  // Rasterize a glyph.  The <xFrac> and <yFrac> values are the same
-  // as described for getGlyph.
-  virtual GBool makeGlyph(int c, int xFrac, int yFrac,
-			  SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
-
-  // Return the path for a glyph.
-  virtual SplashPath *getGlyphPath(int c);
-
-private:
-
-  int t1libID;			// t1lib font ID
-  int outlineID;		// t1lib font ID for glyph outlines
-  float size;
-  float outlineSize;		// size for glyph outlines
-  float outlineMul;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.cc b/kpdf/xpdf/splash/SplashT1FontEngine.cc
deleted file mode 100644
index 68530e88..00000000
--- a/kpdf/xpdf/splash/SplashT1FontEngine.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-//========================================================================
-//
-// SplashT1FontEngine.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef WIN32
-#  include <unistd.h>
-#endif
-#include <t1lib.h>
-#include "GString.h"
-#include "gfile.h"
-#include "FoFiType1C.h"
-#include "SplashT1FontFile.h"
-#include "SplashT1FontEngine.h"
-
-#ifdef VMS
-#if (__VMS_VER < 70000000)
-extern "C" int unlink(char *filename);
-#endif
-#endif
-
-//------------------------------------------------------------------------
-
-int SplashT1FontEngine::t1libInitCount = 0;
-
-//------------------------------------------------------------------------
-
-static void fileWrite(void *stream, char *data, int len) {
-  fwrite(data, 1, len, (FILE *)stream);
-}
-
-//------------------------------------------------------------------------
-// SplashT1FontEngine
-//------------------------------------------------------------------------
-
-SplashT1FontEngine::SplashT1FontEngine(GBool aaA) {
-  aa = aaA;
-}
-
-SplashT1FontEngine *SplashT1FontEngine::init(GBool aaA) {
-  // grayVals[i] = round(i * 255 / 16)
-  static unsigned long grayVals[17] = {
-    0, 16, 32, 48, 64, 80, 96, 112, 128, 143, 159, 175, 191, 207, 223, 239, 255
-  };
-
-  //~ for multithreading: need a mutex here
-  if (t1libInitCount == 0) {
-    T1_SetBitmapPad(8);
-    if (!T1_InitLib(NO_LOGFILE | IGNORE_CONFIGFILE | IGNORE_FONTDATABASE |
-		    T1_NO_AFM)) {
-      return NULL;
-    }
-    if (aaA) {
-      T1_AASetBitsPerPixel(8);
-      T1_AASetLevel(T1_AA_HIGH);
-      T1_AAHSetGrayValues(grayVals);
-    } else {
-      T1_AANSetGrayValues(0, 1);
-    }
-  }
-  ++t1libInitCount;
-
-  return new SplashT1FontEngine(aaA);
-}
-
-SplashT1FontEngine::~SplashT1FontEngine() {
-  //~ for multithreading: need a mutex here
-  if (--t1libInitCount == 0) {
-    T1_CloseLib();
-  }
-}
-
-SplashFontFile *SplashT1FontEngine::loadType1Font(SplashFontFileID *idA,
-						  SplashFontSrc *src,
-						  char **enc) {
-  return SplashT1FontFile::loadType1Font(this, idA, fileName, deleteFile, enc);
-}
-
-SplashFontFile *SplashT1FontEngine::loadType1CFont(SplashFontFileID *idA,
-						   SplashFontSrc *src,
-						   char **enc) {
-  FoFiType1C *ff;
-  GString *tmpFileName;
-  FILE *tmpFile;
-  SplashFontFile *ret;
-  SplashFontSrc *newsrc;
-
-  if (src->isFile)
-    ff = FoFiType1C::load(src->fileName);
-  else
-    ff = new FoFiType1C(src->buf, src->bufLen, gFalse);
-  if (! ff)
-    return NULL;
-  }
-  tmpFileName = NULL;
-  if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
-    delete ff;
-    return NULL;
-  }
-  ff->convertToType1(NULL, NULL, gTrue, &fileWrite, tmpFile);
-  delete ff;
-  fclose(tmpFile);
-  newsrc = new SplashFontSrc;
-  newsrc->setFile(tmpFileName, gTrue);
-  delete tmpFileName;
-  ret = SplashT1FontFile::loadType1Font(this, idA, newsrc, enc);
-  newsrc->unref();
-  return ret;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.h b/kpdf/xpdf/splash/SplashT1FontEngine.h
deleted file mode 100644
index 57a04487..00000000
--- a/kpdf/xpdf/splash/SplashT1FontEngine.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//========================================================================
-//
-// SplashT1FontEngine.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONTENGINE_H
-#define SPLASHT1FONTENGINE_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "gtypes.h"
-
-class SplashFontFile;
-class SplashFontFileID;
-
-//------------------------------------------------------------------------
-// SplashT1FontEngine
-//------------------------------------------------------------------------
-
-class SplashT1FontEngine {
-public:
-
-  static SplashT1FontEngine *init(GBool aaA);
-
-  ~SplashT1FontEngine();
-
-  // Load fonts.
-  SplashFontFile *loadType1Font(SplashFontFileID *idA, char *fileName,
-				GBool deleteFile, char **enc);
-  SplashFontFile *loadType1CFont(SplashFontFileID *idA, char *fileName,
-				 GBool deleteFile, char **enc);
-
-private:
-
-  SplashT1FontEngine(GBool aaA);
-
-  static int t1libInitCount;
-  GBool aa;
-
-  friend class SplashT1FontFile;
-  friend class SplashT1Font;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
diff --git a/kpdf/xpdf/splash/SplashT1FontFile.cc b/kpdf/xpdf/splash/SplashT1FontFile.cc
deleted file mode 100644
index 54312055..00000000
--- a/kpdf/xpdf/splash/SplashT1FontFile.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-//========================================================================
-//
-// SplashT1FontFile.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <string.h>
-#include <t1lib.h>
-#include "gmem.h"
-#include "SplashT1FontEngine.h"
-#include "SplashT1Font.h"
-#include "SplashT1FontFile.h"
-
-//------------------------------------------------------------------------
-// SplashT1FontFile
-//------------------------------------------------------------------------
-
-SplashFontFile *SplashT1FontFile::loadType1Font(SplashT1FontEngine *engineA,
-						SplashFontFileID *idA,
-						SplashFontSrc *src,
-						char **encA) {
-  int t1libIDA;
-  char **encTmp;
-  char *encStrTmp;
-  int encStrSize;
-  char *encPtr;
-  int i;
-
-  GString *fileNameA;
-  SplashFontSrc *newsrc = NULL;
-  SplashFontFile *ff;
-
-  if (! src->isFile) {
-    GString *tmpFileName;
-    FILE *tmpFile;
-    if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL))
-      return NULL;
-    fwrite(src->buf, 1, src->bufLen, tmpFile);
-    fclose(tmpFile);
-    newsrc = new SplashFontSrc;
-    newsrc->setFile(tmpFileName, gTrue);
-    src = newsrc;
-    delete tmpFileName;
-  }
-  fileNameA = src->fileName;
-  // load the font file
-  if ((t1libIDA = T1_AddFont(fileNameA)) < 0) {
-    delete newsrc;
-    return NULL;
-  }
-  T1_LoadFont(t1libIDA);
-
-  // reencode it
-  encStrSize = 0;
-  for (i = 0; i < 256; ++i) {
-    if (encA[i]) {
-      encStrSize += strlen(encA[i]) + 1;
-    }
-  }
-  encTmp = (char **)gmallocn(257, sizeof(char *));
-  encStrTmp = (char *)gmallocn(encStrSize, sizeof(char));
-  encPtr = encStrTmp;
-  for (i = 0; i < 256; ++i) {
-    if (encA[i]) {
-      strcpy(encPtr, encA[i]);
-      encTmp[i] = encPtr;
-      encPtr += strlen(encPtr) + 1;
-    } else {
-      encTmp[i] = ".notdef";
-    }
-  }
-  encTmp[256] = "custom";
-  T1_ReencodeFont(t1libIDA, encTmp);
-
-  ff = new SplashT1FontFile(engineA, idA, src,
- 			      t1libIDA, encTmp, encStrTmp);
-  if (newsrc)
-    newsrc->unref();
-  return ff;
-}
-
-SplashT1FontFile::SplashT1FontFile(SplashT1FontEngine *engineA,
-				   SplashFontFileID *idA,
-				   SplashFontSrc *srcA,
-				   int t1libIDA, char **encA, char *encStrA):
-  SplashFontFile(idA, srcA)
-{
-  engine = engineA;
-  t1libID = t1libIDA;
-  enc = encA;
-  encStr = encStrA;
-}
-
-SplashT1FontFile::~SplashT1FontFile() {
-  gfree(encStr);
-  gfree(enc);
-  T1_DeleteFont(t1libID);
-}
-
-SplashFont *SplashT1FontFile::makeFont(SplashCoord *mat,
-				       SplashCoord *textMat) {
-  SplashFont *font;
-
-  font = new SplashT1Font(this, mat, textMat);
-  font->initCache();
-  return font;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1FontFile.h b/kpdf/xpdf/splash/SplashT1FontFile.h
deleted file mode 100644
index 4dc93cbf..00000000
--- a/kpdf/xpdf/splash/SplashT1FontFile.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//========================================================================
-//
-// SplashT1FontFile.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONTFILE_H
-#define SPLASHT1FONTFILE_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "SplashFontFile.h"
-
-class SplashT1FontEngine;
-
-//------------------------------------------------------------------------
-// SplashT1FontFile
-//------------------------------------------------------------------------
-
-class SplashT1FontFile: public SplashFontFile {
-public:
-
-  static SplashFontFile *loadType1Font(SplashT1FontEngine *engineA,
-				       SplashFontFileID *idA,
-				       char *fileNameA,
-				       char **encA);
-
-  virtual ~SplashT1FontFile();
-
-  // Create a new SplashT1Font, i.e., a scaled instance of this font
-  // file.
-  virtual SplashFont *makeFont(SplashCoord *mat,
-			       SplashCoord *textMat);
-
-private:
-
-  SplashT1FontFile(SplashT1FontEngine *engineA,
-		   SplashFontFileID *idA,
-		   char *fileNameA,
-		   int t1libIDA, char **encA, char *encStrA);
-
-  SplashT1FontEngine *engine;
-  int t1libID;			// t1lib font ID
-  char **enc;
-  char *encStr;
-
-  friend class SplashT1Font;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
diff --git a/kpdf/xpdf/splash/SplashTypes.h b/kpdf/xpdf/splash/SplashTypes.h
index 35551b90..aa431b78 100644
--- a/kpdf/xpdf/splash/SplashTypes.h
+++ b/kpdf/xpdf/splash/SplashTypes.h
@@ -48,7 +48,7 @@ enum SplashColorMode {
 };
 
 // number of components in each color mode
-// (defined in SplashState.cc)
+// (defined in SplashState.cpp)
 extern int splashColorModeNComps[];
 
 // max number of components in any SplashColor
diff --git a/kpdf/xpdf/splash/SplashXPath.cc b/kpdf/xpdf/splash/SplashXPath.cpp
index 71481eff..267643bb 100644
--- a/kpdf/xpdf/splash/SplashXPath.cc
+++ b/kpdf/xpdf/splash/SplashXPath.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashXPath.cc
+// SplashXPath.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashXPathScanner.cc b/kpdf/xpdf/splash/SplashXPathScanner.cpp
index 97e5a9bc..8c7d505a 100644
--- a/kpdf/xpdf/splash/SplashXPathScanner.cc
+++ b/kpdf/xpdf/splash/SplashXPathScanner.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashXPathScanner.cc
+// SplashXPathScanner.cpp
 //
 //========================================================================