[poppler] poppler/poppler: CairoFontEngine.cc, 1.3, 1.4 Page.cc, 1.3, 1.4

[Kristian Hogsberg]

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

Modified Files:
	CairoFontEngine.cc Page.cc 
Log Message:
Thu Apr 21 00:15:30 2005  Kristian Høgsberg  <krh at redhat.com>

        * glib/poppler-document.cc (poppler_document_new_from_file): Add
        output device (cairo or splash) to PopplerDocument and initialize
        it in the constructor.

        * glib/poppler-page.cc (splash_render_to_pixbuf,
        cairo_render_to_pixbuf): Use output device from associated poppler
        document instead of creating a new one.

        * poppler-glib.pc.in (Requires): Add Requires: field.

        * poppler/Page.cc (loadThumb): Remove unecessary and buggy call to
        Stream::addFilters(), reported by Ryan Lortie (#3046).



Index: CairoFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoFontEngine.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CairoFontEngine.cc	5 Apr 2005 17:46:44 -0000	1.3
+++ CairoFontEngine.cc	21 Apr 2005 05:20:25 -0000	1.4
@@ -82,7 +82,7 @@
   fontType = gfxFont->getType();
 
   tmpFileName = NULL;
-  
+
   if (gfxFont->getEmbeddedFontID(&embRef)) {
     if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
       error(-1, "Couldn't create temporary font file");

Index: Page.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Page.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Page.cc	2 Apr 2005 22:16:38 -0000	1.3
+++ Page.cc	21 Apr 2005 05:20:25 -0000	1.4
@@ -447,8 +447,6 @@
     goto fail1;
   }
 
-  str->addFilters(&fetched_thumb);
-
   pixbufdata = (unsigned char *) gmalloc(pixbufdatasize);
   p = pixbufdata;
   imgstr = new ImageStream(str, width,