? 01-xpdf-3.00pl1.patch
? 02-xpdf-3.00pl2.patch
? 03-xpdf-3.00pl3.patch
? 10-xpdf-3.01-docs.patch
? 11-xpdf-3.01-fixedpoint.patch
? 12-xpdf-3.01-no-no-decryption.patch
? 13-xpdf-3.01-goo-allocn.patch
? 14-xpdf-3.01-copyright-etc-updates.patch
? 15-xpdf-3.01-new-freetype.patch
Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.35
diff -u -r1.35 configure.ac
--- configure.ac	7 Sep 2005 03:00:36 -0000	1.35
+++ configure.ac	15 Sep 2005 10:35:49 -0000
@@ -137,27 +137,14 @@
                   [freetype_pkgconfig=yes], [freetype_pkgconfig=no])
 
 if test "x$freetype_pkgconfig" = "xyes"; then
-
   AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-  AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has the freetype library 2.1.7 or older])
-
 else
-
   AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
   if test "x$FREETYPE_CONFIG" != "xno" ; then
     FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
     FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
     AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
-  
-    vers=`$FREETYPE_CONFIG --version 2>/dev/null | sed -e 's/libfreetype //' | awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
-    min_vers=`echo $FREETYPE_MIN_VERSION | awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
-    if test -n "$vers" && test "$vers" -le $min_vers; then
-      AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 1, [Defines if your system has the freetype library 2.1.7 or older])
-    else
-      AC_DEFINE_UNQUOTED(HAVE_FREETYPE_217_OR_OLDER, 0, [Defines if your system has the freetype library 2.1.7 or older])
-    fi
   fi
-
 fi
 
 AC_SUBST(FREETYPE_CFLAGS)
Index: poppler/NameToUnicodeTable.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/NameToUnicodeTable.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 NameToUnicodeTable.h
--- poppler/NameToUnicodeTable.h	3 Mar 2005 19:46:01 -0000	1.1.1.1
+++ poppler/NameToUnicodeTable.h	15 Sep 2005 10:35:53 -0000
@@ -2,7 +2,7 @@
 //
 // NameToUnicodeTable.h
 //
-// Copyright 2001-2003 Glyph & Cog, LLC
+// Copyright 2001-2004 Glyph & Cog, LLC
 //
 //========================================================================
 
Index: poppler/UnicodeTypeTable.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/UnicodeTypeTable.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 UnicodeTypeTable.cc
--- poppler/UnicodeTypeTable.cc	3 Mar 2005 19:46:04 -0000	1.1.1.1
+++ poppler/UnicodeTypeTable.cc	15 Sep 2005 10:35:57 -0000
@@ -1,8 +1,8 @@
 //========================================================================
 //
-// UnicodeMapTables.cc
+// UnicodeTypeTable.cc
 //
-// Copyright 2003 Glyph & Cog, LLC
+// Copyright 2004 Glyph & Cog, LLC
 //
 //========================================================================
 
Index: splash/SplashFTFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFTFontEngine.cc,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SplashFTFontEngine.cc
--- splash/SplashFTFontEngine.cc	3 Mar 2005 19:45:59 -0000	1.1.1.1
+++ splash/SplashFTFontEngine.cc	15 Sep 2005 10:35:57 -0000
@@ -41,8 +41,15 @@
 //------------------------------------------------------------------------
 
 SplashFTFontEngine::SplashFTFontEngine(GBool aaA, FT_Library libA) {
+  FT_Int major, minor, patch;
+
   aa = aaA;
   lib = libA;
+
+  // as of FT 2.1.8, CID fonts are indexed by CID instead of GID
+  FT_Library_Version(lib, &major, &minor, &patch);
+  useCIDs = major > 2 ||
+            (major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
 }
 
 SplashFTFontEngine *SplashFTFontEngine::init(GBool aaA) {
@@ -81,20 +88,16 @@
   SplashFontFile *ret;
 
   // check for a CFF font
-#if HAVE_FREETYPE_217_OR_OLDER
-  if ((ff = FoFiType1C::load(fileName))) {
+  if (useCIDs) {
+    cidToGIDMap = NULL;
+    nCIDs = 0;
+  } else if ((ff = FoFiType1C::load(fileName))) {
     cidToGIDMap = ff->getCIDToGIDMap(&nCIDs);
     delete ff;
   } else {
     cidToGIDMap = NULL;
     nCIDs = 0;
   }
-#else
-  // No need to check for CFF Font, freetype treats all CID fonts the same way
-  cidToGIDMap = NULL;
-  nCIDs = 0;
-#endif
-
   ret = SplashFTFontFile::loadCIDFont(this, idA, fileName, deleteFile,
 				      cidToGIDMap, nCIDs);
   if (!ret) {
Index: splash/SplashFTFontEngine.h
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFTFontEngine.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 SplashFTFontEngine.h
--- splash/SplashFTFontEngine.h	3 Mar 2005 19:45:59 -0000	1.1.1.1
+++ splash/SplashFTFontEngine.h	15 Sep 2005 10:35:57 -0000
@@ -48,6 +48,7 @@
 
   GBool aa;
   FT_Library lib;
+  GBool useCIDs;
 
   friend class SplashFTFontFile;
   friend class SplashFTFont;