43 files changed, 60 insertions, 87 deletions

diff --git a/kpdf/xpdf/xpdf/Annot.cc b/kpdf/xpdf/xpdf/Annot.cpp
index 23df25df..10d3ce73 100644
--- a/kpdf/xpdf/xpdf/Annot.cc
+++ b/kpdf/xpdf/xpdf/Annot.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Annot.cc
+// Annot.cpp
 //
 // Copyright 2000-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Array.cc b/kpdf/xpdf/xpdf/Array.cpp
index 8232037b..7c54605a 100644
--- a/kpdf/xpdf/xpdf/Array.cc
+++ b/kpdf/xpdf/xpdf/Array.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Array.cc
+// Array.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/BuiltinFont.cc b/kpdf/xpdf/xpdf/BuiltinFont.cpp
index ce989571..6e9d2375 100644
--- a/kpdf/xpdf/xpdf/BuiltinFont.cc
+++ b/kpdf/xpdf/xpdf/BuiltinFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFont.cc
+// BuiltinFont.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/BuiltinFontTables.cc b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp
index 9c362389..9779946f 100644
--- a/kpdf/xpdf/xpdf/BuiltinFontTables.cc
+++ b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFontTables.cc
+// BuiltinFontTables.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/CMakeLists.txt b/kpdf/xpdf/xpdf/CMakeLists.txt
index db01bb97..bf9f329c 100644
--- a/kpdf/xpdf/xpdf/CMakeLists.txt
+++ b/kpdf/xpdf/xpdf/CMakeLists.txt
@@ -24,14 +24,14 @@ include_directories(
 
 tde_add_library( xpdf STATIC_PIC
   SOURCES
-    Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc
-    Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc
-    FontEncodingTables.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc
-    GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc
-    NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc
-    PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc Page.cc
-    Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc
-    Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc
-    UnicodeTypeTable.cc XRef.cc
+    Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp
+    Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp
+    FontEncodingTables.cpp Function.cpp Gfx.cpp GfxFont.cpp GfxState.cpp
+    GlobalParams.cpp JArithmeticDecoder.cpp JBIG2Stream.cpp Lexer.cpp Link.cpp
+    NameToCharCode.cpp Object.cpp Outline.cpp OutputDev.cpp PDFDoc.cpp
+    PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp Page.cpp
+    Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp
+    Stream.cpp JPXStream.cpp TextOutputDev.cpp UnicodeMap.cpp
+    UnicodeTypeTable.cpp XRef.cpp
   LINK ${FONTCONFIG_LIBRARIES}
 )
diff --git a/kpdf/xpdf/xpdf/CMap.cc b/kpdf/xpdf/xpdf/CMap.cpp
index 89905a8c..dfad915f 100644
--- a/kpdf/xpdf/xpdf/CMap.cc
+++ b/kpdf/xpdf/xpdf/CMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CMap.cc
+// CMap.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Catalog.cc b/kpdf/xpdf/xpdf/Catalog.cpp
index 198703a4..ce64af09 100644
--- a/kpdf/xpdf/xpdf/Catalog.cc
+++ b/kpdf/xpdf/xpdf/Catalog.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Catalog.cc
+// Catalog.cpp
 //
 // Copyright 1996-2007 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp
index 3702a16d..1144caec 100644
--- a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc
+++ b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CharCodeToUnicode.cc
+// CharCodeToUnicode.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Decrypt.cc b/kpdf/xpdf/xpdf/Decrypt.cpp
index 51e56fb1..97fa0bd6 100644
--- a/kpdf/xpdf/xpdf/Decrypt.cc
+++ b/kpdf/xpdf/xpdf/Decrypt.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Decrypt.cc
+// Decrypt.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Dict.cc b/kpdf/xpdf/xpdf/Dict.cpp
index dd1517f0..593e9a11 100644
--- a/kpdf/xpdf/xpdf/Dict.cc
+++ b/kpdf/xpdf/xpdf/Dict.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Dict.cc
+// Dict.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/FontEncodingTables.cc b/kpdf/xpdf/xpdf/FontEncodingTables.cpp
index f3b9280a..4cd1affe 100644
--- a/kpdf/xpdf/xpdf/FontEncodingTables.cc
+++ b/kpdf/xpdf/xpdf/FontEncodingTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontEncodingTables.cc
+// FontEncodingTables.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Function.cc b/kpdf/xpdf/xpdf/Function.cpp
index eaf8e974..f36c8f6c 100644
--- a/kpdf/xpdf/xpdf/Function.cc
+++ b/kpdf/xpdf/xpdf/Function.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Function.cc
+// Function.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Gfx.cc b/kpdf/xpdf/xpdf/Gfx.cpp
index e3df8384..2a4fdb6e 100644
--- a/kpdf/xpdf/xpdf/Gfx.cc
+++ b/kpdf/xpdf/xpdf/Gfx.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Gfx.cc
+// Gfx.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxFont.cc b/kpdf/xpdf/xpdf/GfxFont.cpp
index 8694be47..4298b41c 100644
--- a/kpdf/xpdf/xpdf/GfxFont.cc
+++ b/kpdf/xpdf/xpdf/GfxFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxFont.cc
+// GfxFont.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxState.cc b/kpdf/xpdf/xpdf/GfxState.cpp
index a00dabe1..f7cb1ce9 100644
--- a/kpdf/xpdf/xpdf/GfxState.cc
+++ b/kpdf/xpdf/xpdf/GfxState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxState.cc
+// GfxState.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxState.h b/kpdf/xpdf/xpdf/GfxState.h
index f85643dc..52c5c93c 100644
--- a/kpdf/xpdf/xpdf/GfxState.h
+++ b/kpdf/xpdf/xpdf/GfxState.h
@@ -114,7 +114,7 @@ struct GfxCMYK {
 //------------------------------------------------------------------------
 
 // NB: The nGfxColorSpaceModes constant and the gfxColorSpaceModeNames
-// array defined in GfxState.cc must match this enum.
+// array defined in GfxState.cpp must match this enum.
 enum GfxColorSpaceMode {
   csDeviceGray,
   csCalGray,
diff --git a/kpdf/xpdf/xpdf/GlobalParams.cc b/kpdf/xpdf/xpdf/GlobalParams.cpp
index 6212f42e..d98a0ce5 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.cc
+++ b/kpdf/xpdf/xpdf/GlobalParams.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GlobalParams.cc
+// GlobalParams.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
@@ -713,7 +713,6 @@ GlobalParams::GlobalParams(char *cfgFileName) {
   fontDirs = new GList();
   initialZoom = new GString("125");
   continuousView = gFalse;
-  enableT1lib = gTrue;
   enableFreeType = gTrue;
   antialias = gTrue;
   vectorAntialias = gTrue;
@@ -1073,8 +1072,6 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) {
       parseInitialZoom(tokens, fileName, line);
     } else if (!cmd->cmp("continuousView")) {
       parseYesNo("continuousView", &continuousView, tokens, fileName, line);
-    } else if (!cmd->cmp("enableT1lib")) {
-      parseYesNo("enableT1lib", &enableT1lib, tokens, fileName, line);
     } else if (!cmd->cmp("enableFreeType")) {
       parseYesNo("enableFreeType", &enableFreeType, tokens, fileName, line);
     } else if (!cmd->cmp("antialias")) {
@@ -1125,9 +1122,9 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) {
 	  !cmd->cmp("displayNamedCIDFontX") ||
 	  !cmd->cmp("displayCIDFontX")) {
 	error(-1, "-- Xpdf no longer supports X fonts");
-      } else if (!cmd->cmp("t1libControl") || !cmd->cmp("freetypeControl")) {
-	error(-1, "-- The t1libControl and freetypeControl options have been replaced");
-	error(-1, "   by the enableT1lib, enableFreeType, and antialias options");
+      } else if (!cmd->cmp("freetypeControl")) {
+	error(-1, "-- The freetypeControl option has been replaced");
+	error(-1, "   by the enableFreeType, and antialias options");
       } else if (!cmd->cmp("fontpath") || !cmd->cmp("fontmap")) {
 	error(-1, "-- the config file format has changed since Xpdf 0.9x");
       }
@@ -2094,7 +2091,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
 	if (res != FcResultMatch || !s)  goto fin; 
 	ext = rindex((char*)s,'.');
 	if (!ext) goto fin;
-	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4)) {
+	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4) || !strncasecmp(ext,".otf",4)) {
 	  dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
 	  dfp->tt.fileName = new GString((char*)s);
 	  FcPatternGetInteger(m, FC_INDEX, 0, &(dfp->tt.faceIndex));
@@ -2395,15 +2392,6 @@ GBool GlobalParams::getContinuousView() {
   return f;
 }
 
-GBool GlobalParams::getEnableT1lib() {
-  GBool f;
-
-  lockGlobalParams;
-  f = enableT1lib;
-  unlockGlobalParams;
-  return f;
-}
-
 GBool GlobalParams::getEnableFreeType() {
   GBool f;
 
@@ -2827,15 +2815,6 @@ void GlobalParams::setContinuousView(GBool cont) {
   unlockGlobalParams;
 }
 
-GBool GlobalParams::setEnableT1lib(char *s) {
-  GBool ok;
-
-  lockGlobalParams;
-  ok = parseYesNo2(s, &enableT1lib);
-  unlockGlobalParams;
-  return ok;
-}
-
 GBool GlobalParams::setEnableFreeType(char *s) {
   GBool ok;
 
diff --git a/kpdf/xpdf/xpdf/GlobalParams.h b/kpdf/xpdf/xpdf/GlobalParams.h
index c0543eda..85b3c27d 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.h
+++ b/kpdf/xpdf/xpdf/GlobalParams.h
@@ -242,7 +242,6 @@ public:
   GString *findFontFile(GString *fontName, char **exts);
   GString *getInitialZoom();
   GBool getContinuousView();
-  GBool getEnableT1lib();
   GBool getEnableFreeType();
   GBool getAntialias();
   GBool getVectorAntialias();
@@ -294,7 +293,6 @@ public:
   void setTextKeepTinyChars(GBool keep);
   void setInitialZoom(char *s);
   void setContinuousView(GBool cont);
-  GBool setEnableT1lib(char *s);
   GBool setEnableFreeType(char *s);
   GBool setAntialias(char *s);
   GBool setVectorAntialias(char *s);
@@ -424,7 +422,6 @@ private:
   GList *fontDirs;		// list of font dirs [GString]
   GString *initialZoom;		// initial zoom level
   GBool continuousView;		// continuous view mode
-  GBool enableT1lib;		// t1lib enable flag
   GBool enableFreeType;		// FreeType enable flag
   GBool antialias;		// font anti-aliasing enable flag
   GBool vectorAntialias;	// vector anti-aliasing enable flag
diff --git a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp
index 195b73e1..7f7c7685 100644
--- a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc
+++ b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JArithmeticDecoder.cc
+// JArithmeticDecoder.cpp
 //
 // Copyright 2002-2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/JBIG2Stream.cc b/kpdf/xpdf/xpdf/JBIG2Stream.cpp
index 43f17712..1a4058f8 100644
--- a/kpdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/kpdf/xpdf/xpdf/JBIG2Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JBIG2Stream.cc
+// JBIG2Stream.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/JPXStream.cc b/kpdf/xpdf/xpdf/JPXStream.cpp
index 54a9e103..93b46471 100644
--- a/kpdf/xpdf/xpdf/JPXStream.cc
+++ b/kpdf/xpdf/xpdf/JPXStream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JPXStream.cc
+// JPXStream.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Lexer.cc b/kpdf/xpdf/xpdf/Lexer.cpp
index 1ef37175..04eadef2 100644
--- a/kpdf/xpdf/xpdf/Lexer.cc
+++ b/kpdf/xpdf/xpdf/Lexer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Lexer.cc
+// Lexer.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Link.cc b/kpdf/xpdf/xpdf/Link.cpp
index ae2de537..69106e13 100644
--- a/kpdf/xpdf/xpdf/Link.cc
+++ b/kpdf/xpdf/xpdf/Link.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Link.cc
+// Link.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Makefile.am b/kpdf/xpdf/xpdf/Makefile.am
index 4c0593ad..b86e26b8 100644
--- a/kpdf/xpdf/xpdf/Makefile.am
+++ b/kpdf/xpdf/xpdf/Makefile.am
@@ -2,14 +2,14 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/
 
 libxpdf_la_LDFLAGS = $(all_libraries)
 libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
-libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-     Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \
-     FontEncodingTables.cc Function.cc Gfx.cc \
-     GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
-     JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \
-     OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc \
-     Page.cc Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc Stream.cc JPXStream.cc \
-     TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc
+libxpdf_la_SOURCES = Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp \
+     Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp \
+     FontEncodingTables.cpp Function.cpp Gfx.cpp \
+     GfxFont.cpp GfxState.cpp GlobalParams.cpp JArithmeticDecoder.cpp \
+     JBIG2Stream.cpp Lexer.cpp Link.cpp NameToCharCode.cpp Object.cpp Outline.cpp \
+     OutputDev.cpp PDFDoc.cpp PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp \
+     Page.cpp Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp Stream.cpp JPXStream.cpp \
+     TextOutputDev.cpp UnicodeMap.cpp UnicodeTypeTable.cpp XRef.cpp
 
 noinst_LTLIBRARIES = libxpdf.la
 
diff --git a/kpdf/xpdf/xpdf/NameToCharCode.cc b/kpdf/xpdf/xpdf/NameToCharCode.cpp
index 7ebf4e16..23779f05 100644
--- a/kpdf/xpdf/xpdf/NameToCharCode.cc
+++ b/kpdf/xpdf/xpdf/NameToCharCode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// NameToCharCode.cc
+// NameToCharCode.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Object.cc b/kpdf/xpdf/xpdf/Object.cpp
index f0a3a092..81760b44 100644
--- a/kpdf/xpdf/xpdf/Object.cc
+++ b/kpdf/xpdf/xpdf/Object.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Object.cc
+// Object.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Outline.cc b/kpdf/xpdf/xpdf/Outline.cpp
index 39e89a3c..f5aba636 100644
--- a/kpdf/xpdf/xpdf/Outline.cc
+++ b/kpdf/xpdf/xpdf/Outline.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Outline.cc
+// Outline.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/OutputDev.cc b/kpdf/xpdf/xpdf/OutputDev.cpp
index 3ba19973..1b394ad4 100644
--- a/kpdf/xpdf/xpdf/OutputDev.cc
+++ b/kpdf/xpdf/xpdf/OutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// OutputDev.cc
+// OutputDev.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PDFDoc.cc b/kpdf/xpdf/xpdf/PDFDoc.cpp
index dc24d97e..ee2bc4df 100644
--- a/kpdf/xpdf/xpdf/PDFDoc.cc
+++ b/kpdf/xpdf/xpdf/PDFDoc.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PDFDoc.cc
+// PDFDoc.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PDFDocEncoding.cc b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp
index 89dc3828..89dc3828 100644
--- a/kpdf/xpdf/xpdf/PDFDocEncoding.cc
+++ b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp
diff --git a/kpdf/xpdf/xpdf/PSOutputDev.cc b/kpdf/xpdf/xpdf/PSOutputDev.cpp
index 4fb2cbfd..9d1d7648 100644
--- a/kpdf/xpdf/xpdf/PSOutputDev.cc
+++ b/kpdf/xpdf/xpdf/PSOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSOutputDev.cc
+// PSOutputDev.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PSTokenizer.cc b/kpdf/xpdf/xpdf/PSTokenizer.cpp
index a959cc73..4898fe42 100644
--- a/kpdf/xpdf/xpdf/PSTokenizer.cc
+++ b/kpdf/xpdf/xpdf/PSTokenizer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSTokenizer.cc
+// PSTokenizer.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Page.cc b/kpdf/xpdf/xpdf/Page.cpp
index cfeab88b..de2fe6c0 100644
--- a/kpdf/xpdf/xpdf/Page.cc
+++ b/kpdf/xpdf/xpdf/Page.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Page.cc
+// Page.cpp
 //
 // Copyright 1996-2007 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Parser.cc b/kpdf/xpdf/xpdf/Parser.cpp
index 65a43d94..95475b85 100644
--- a/kpdf/xpdf/xpdf/Parser.cc
+++ b/kpdf/xpdf/xpdf/Parser.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Parser.cc
+// Parser.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PreScanOutputDev.cc b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp
index 52ffeb7f..e05cdc34 100644
--- a/kpdf/xpdf/xpdf/PreScanOutputDev.cc
+++ b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PreScanOutputDev.cc
+// PreScanOutputDev.cpp
 //
 // Copyright 2005 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/SecurityHandler.cc b/kpdf/xpdf/xpdf/SecurityHandler.cpp
index ea0f9341..6c2abba0 100644
--- a/kpdf/xpdf/xpdf/SecurityHandler.cc
+++ b/kpdf/xpdf/xpdf/SecurityHandler.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SecurityHandler.cc
+// SecurityHandler.cpp
 //
 // Copyright 2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/SplashOutputDev.cc b/kpdf/xpdf/xpdf/SplashOutputDev.cpp
index fe235fb8..20898701 100644
--- a/kpdf/xpdf/xpdf/SplashOutputDev.cc
+++ b/kpdf/xpdf/xpdf/SplashOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashOutputDev.cc
+// SplashOutputDev.cpp
 //
 // Copyright 2003 Glyph & Cog, LLC
 //
@@ -694,9 +694,6 @@ void SplashOutputDev::startDoc(XRef *xrefA) {
     delete fontEngine;
   }
   fontEngine = new SplashFontEngine(
-#if HAVE_T1LIB_H
-				    globalParams->getEnableT1lib(),
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 				    globalParams->getEnableFreeType(),
 #endif
diff --git a/kpdf/xpdf/xpdf/Stream.cc b/kpdf/xpdf/xpdf/Stream.cpp
index 2c1db5b4..0d85a766 100644
--- a/kpdf/xpdf/xpdf/Stream.cc
+++ b/kpdf/xpdf/xpdf/Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Stream.cc
+// Stream.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/TextOutputDev.cc b/kpdf/xpdf/xpdf/TextOutputDev.cpp
index d2bfaf63..3387a31a 100644
--- a/kpdf/xpdf/xpdf/TextOutputDev.cc
+++ b/kpdf/xpdf/xpdf/TextOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TextOutputDev.cc
+// TextOutputDev.cpp
 //
 // Copyright 1997-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/UnicodeMap.cc b/kpdf/xpdf/xpdf/UnicodeMap.cpp
index 2b8cb1f7..f3d18715 100644
--- a/kpdf/xpdf/xpdf/UnicodeMap.cc
+++ b/kpdf/xpdf/xpdf/UnicodeMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeMap.cc
+// UnicodeMap.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp
index b8960403..39b9d842 100644
--- a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc
+++ b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeTypeTable.cc
+// UnicodeTypeTable.cpp
 //
 // Copyright 2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/XRef.cc b/kpdf/xpdf/xpdf/XRef.cpp
index 2e0d1cef..06a1c4e1 100644
--- a/kpdf/xpdf/xpdf/XRef.cc
+++ b/kpdf/xpdf/xpdf/XRef.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XRef.cc
+// XRef.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/xpdf_config.h b/kpdf/xpdf/xpdf/xpdf_config.h
index 81d4dd07..f00a6381 100644
--- a/kpdf/xpdf/xpdf/xpdf_config.h
+++ b/kpdf/xpdf/xpdf/xpdf_config.h
@@ -74,7 +74,7 @@
 // default maximum size of color cube to allocate
 #define defaultRGBCube 5
 
-// number of fonts (combined t1lib, FreeType, X server) to cache
+// number of fonts (combined FreeType, X server) to cache
 #define xOutFontCacheSize 64
 
 // number of Type 3 fonts to cache