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

[Kristian Høgsberg]

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

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

        * glib/poppler-page.cc (poppler_page_set_selection_alpha): Use
        Nickolays original fix instead of trying to be clever with
        gdk_pixbuf_fill().

        * poppler/CairoFontEngine.cc: Fix text corruption bug (#5149),
        a rerun of an old classic (#3340).



Index: CairoFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CairoFontEngine.cc	16 Sep 2005 18:11:14 -0000	1.17
+++ CairoFontEngine.cc	4 Dec 2005 02:24:26 -0000	1.18
@@ -162,6 +162,7 @@
     codeToGID = NULL;
     codeToGIDLen = 0;
 
+#if HAVE_FREETYPE_217_OR_OLDER
     if (useCIDs)
     {
       if ((ff1c = FoFiType1C::load(fileName->getCString()))) {
@@ -169,6 +170,7 @@
         delete ff1c;
       }
     }
+#endif
 
     if (FT_New_Face(lib, fileName->getCString(), 0, &face)) {
       gfree(codeToGID);