[poppler] poppler/poppler: CairoFontEngine.cc,1.11,1.12

[Kristian Hogsberg]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv23218/poppler

Modified Files:
	CairoFontEngine.cc 
Log Message:
2005-05-20  Kristian Høgsberg  <krh at redhat.com>

        * poppler/CairoFontEngine.cc: Only get the code to gid map if
        we're using freetype 2.1.7 or older (#3340).



Index: CairoFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CairoFontEngine.cc	19 May 2005 05:16:22 -0000	1.11
+++ CairoFontEngine.cc	20 May 2005 18:38:10 -0000	1.12
@@ -216,15 +216,18 @@
     
   case fontCIDType0:
   case fontCIDType0C:
-    // check for a CFF font
+
+    codeToGID = NULL;
+    codeToGIDLen = 0;
+
+#if HAVE_FREETYPE_217_OR_OLDER
     if ((ff1c = FoFiType1C::load(fileName->getCString()))) {
       codeToGID = ff1c->getCIDToGIDMap(&codeToGIDLen);
       delete ff1c;
-    } else {
-      codeToGID = NULL;
-      codeToGIDLen = 0;
     }
-    if (FT_New_Face(lib, tmpFileName->getCString(), 0, &face)) {
+#endif
+
+    if (FT_New_Face(lib, fileName->getCString(), 0, &face)) {
       gfree(codeToGID);
       error(-1, "could not create cid face\n");
       goto err2;