[poppler] poppler/poppler: CairoFontEngine.cc,1.18,1.19

[Albert Astals Cid]

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

Modified Files:
	CairoFontEngine.cc 
Log Message:
* poppler/CairoFontEngine.cc: Correct fix for #5149, i broke it when merging xpdf 3.01 patches


Index: CairoFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CairoFontEngine.cc	4 Dec 2005 02:24:26 -0000	1.18
+++ CairoFontEngine.cc	5 Dec 2005 20:46:22 -0000	1.19
@@ -162,15 +162,13 @@
     codeToGID = NULL;
     codeToGIDLen = 0;
 
-#if HAVE_FREETYPE_217_OR_OLDER
-    if (useCIDs)
+    if (!useCIDs)
     {
       if ((ff1c = FoFiType1C::load(fileName->getCString()))) {
         codeToGID = ff1c->getCIDToGIDMap(&codeToGIDLen);
         delete ff1c;
       }
     }
-#endif
 
     if (FT_New_Face(lib, fileName->getCString(), 0, &face)) {
       gfree(codeToGID);