Changeset 253

Timestamp:

Jul 1, 2008, 8:43:38 PM (17 years ago)

Author:

Eugene Romanenko

Message:

PDF plugin: Poppler library updated to version 0.8.4

Location:

trunk

Files:

• Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp (modified) (1 diff)
• Lucide/changelog (modified) (1 diff)
• poppler/mypoppler/poppler/ABWOutputDev.cc (modified) (1 diff)
• poppler/mypoppler/poppler/CairoOutputDev.cc (modified) (2 diffs)
• poppler/mypoppler/poppler/CairoOutputDev.h (modified) (1 diff)
• poppler/mypoppler/poppler/XRef.cc (modified) (1 diff)

trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp ¶

@@ -101 +101 @@
 extern "C" char * EXPENTRY getDescription()
 {
-    return "PDF plugin, based on poppler library v0.8.3";
+    return "PDF plugin, based on poppler library v0.8.4";
 }
 

trunk/Lucide/changelog ¶

@@ -1 +1 @@
 1.XX:
-  - PDF plugin: Poppler (pdf rendering) library updated to version 0.8.3.
+  - PDF plugin: Poppler (pdf rendering) library updated to version 0.8.4.
   - PDF plugin: freetype library updated to version 2.3.7.
 

trunk/poppler/mypoppler/poppler/ABWOutputDev.cc ¶

@@ -254 +254 @@
     }
   }
+  delete[] stt;
+  delete[] end;
   return gap;
 }

trunk/poppler/mypoppler/poppler/CairoOutputDev.cc ¶

@@ -75 +75 @@
 //------------------------------------------------------------------------
 
+// We cannot tie the lifetime of an FT_Library object to that of
+// CairoOutputDev, since any FT_Faces created with it may end up with a
+// reference by Cairo which can be held long after the CairoOutputDev is
+// deleted.  The simplest way to avoid problems is to never tear down the
+// FT_Library instance; to avoid leaks, just use a single global instance
+// initialized the first time it is needed.
+FT_Library CairoOutputDev::ft_lib;
+GBool CairoOutputDev::ft_lib_initialized = gFalse;
+
 CairoOutputDev::CairoOutputDev() {
   xref = NULL;
 
-  FT_Init_FreeType(&ft_lib);
+  if (!ft_lib_initialized) {
+    FT_Init_FreeType(&ft_lib);
+    ft_lib_initialized = gTrue;
+  }
+
   fontEngine = NULL;
   glyphs = NULL;
@@ -103 +116 @@
     delete fontEngine;
   }
-  FT_Done_FreeType(ft_lib);
-  
+
   if (cairo)
     cairo_destroy (cairo);

trunk/poppler/mypoppler/poppler/CairoOutputDev.h ¶

@@ -207 +207 @@
   XRef *xref;                   // xref table for current document
 
-  FT_Library ft_lib;
+  static FT_Library ft_lib;
+  static GBool ft_lib_initialized;
+
   CairoFontEngine *fontEngine;
   cairo_t *cairo;

trunk/poppler/mypoppler/poppler/XRef.cc ¶

@@ -428 +428 @@
       entry.gen = obj.getInt();
       entry.obj.initNull ();
+      entry.updated = false;
       obj.free();
       parser->getObj(&obj);