[poppler] poppler/glib: poppler-action.cc, 1.10.2.1, 1.10.2.2 poppler-page.cc, 1.54, 1.54.2.1

[Jeff Muizelaar]

Update of /cvs/poppler/poppler/glib
In directory kemper:/tmp/cvs-serv11884/glib

Modified Files:
      Tag: xpdf302merge
	poppler-action.cc poppler-page.cc 
Log Message:
Some glib and Catalog merge fixes from carlosgc.


Index: poppler-action.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-action.cc,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -r1.10.2.1 -r1.10.2.2
--- poppler-action.cc	6 Apr 2007 14:22:23 -0000	1.10.2.1
+++ poppler-action.cc	6 Apr 2007 15:36:39 -0000	1.10.2.2
@@ -278,9 +278,7 @@
 	}
 
 	dest->type = POPPLER_DEST_NAMED;
-	name = named_dest->getCString ();
-	dest->named_dest = g_strdup (name);
-	delete[] name;
+	dest->named_dest = g_strdup (named_dest->getCString ());
 
 	return dest;
 }

Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-page.cc,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1
--- poppler-page.cc	24 Feb 2007 23:32:22 -0000	1.54
+++ poppler-page.cc	6 Apr 2007 15:36:39 -0000	1.54.2.1
@@ -332,7 +332,7 @@
 			   0, 0,
 			   (int) ceil (page->page->getCropWidth ()),
 			   (int) ceil (page->page->getCropHeight ()),
-			   NULL, /* links */
+			   gFalse, /* printing */
 			   page->document->doc->getCatalog ());
 
   output_dev->setCairo (NULL);
@@ -378,7 +378,7 @@
 			   gTrue, /* Crop */
 			   src_x, src_y,
 			   src_width, src_height,
-			   NULL, /* links */
+			   gFalse, /* printing */
 			   page->document->doc->getCatalog ());
 
   poppler_page_copy_to_pixbuf (page, pixbuf, &data);
@@ -395,7 +395,7 @@
 				      gFalse, /* useMediaBox */
 				      gTrue, /* Crop */
 				      -1, -1, -1, -1,
-				      NULL, /* links */
+				      gFalse, /* printing */
 				      page->document->doc->getCatalog (),
 				      NULL, NULL, NULL, NULL);
 
@@ -744,7 +744,7 @@
 
   poppler_page_get_size (page, NULL, &height);
   page->page->display (output_dev, 72, 72, 0, gFalse,
-		       gTrue, NULL, doc->getCatalog());
+		       gTrue, gFalse, doc->getCatalog());
   
   matches = NULL;
   xMin = 0;