[poppler] poppler/glib: poppler-action.cc, 1.10, 1.11 poppler-document.cc, 1.41, 1.42 poppler-page.cc, 1.54, 1.55

[Albert Astals Cid]

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

Modified Files:
	poppler-action.cc poppler-document.cc poppler-page.cc 
Log Message:
Merge xpdf302branch in HEAD as noone vetoed it.
Testing more than welcome


Index: poppler-action.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-action.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- poppler-action.cc	28 Jan 2007 15:55:11 -0000	1.10
+++ poppler-action.cc	25 Apr 2007 19:59:10 -0000	1.11
@@ -16,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <UGooString.h>
-
 #include "poppler.h"
 #include "poppler-private.h"
 
@@ -267,7 +265,7 @@
 }
 
 static PopplerDest *
-dest_new_named (UGooString *named_dest)
+dest_new_named (GooString *named_dest)
 {
 	PopplerDest *dest;
 	gchar *name;
@@ -280,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;
 }
@@ -293,7 +289,7 @@
 		 LinkGoTo        *link)
 {
 	LinkDest *link_dest;
-	UGooString *named_dest;
+	GooString *named_dest;
 
 	/* Return if it isn't OK */
 	if (! link->isOk ()) {
@@ -318,7 +314,7 @@
 		   LinkGoToR     *link)
 {
 	LinkDest *link_dest;
-	UGooString *named_dest;
+	GooString *named_dest;
 	
 	/* Return if it isn't OK */
 	if (! link->isOk ()) {

Index: poppler-document.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-document.cc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- poppler-document.cc	24 Feb 2007 23:43:35 -0000	1.41
+++ poppler-document.cc	25 Apr 2007 19:59:10 -0000	1.42
@@ -28,7 +28,6 @@
 #include <Stream.h>
 #include <FontInfo.h>
 #include <PDFDocEncoding.h>
-#include <UGooString.h>
 
 #include "poppler.h"
 #include "poppler-private.h"
@@ -388,12 +387,12 @@
 {
 	PopplerDest *dest = NULL;
 	LinkDest *link_dest = NULL;
-	UGooString *g_link_name;
+	GooString *g_link_name;
 
 	g_return_val_if_fail (POPPLER_IS_DOCUMENT (document), NULL);
 	g_return_val_if_fail (link_name != NULL, NULL);
 
-	g_link_name = new UGooString (link_name);
+	g_link_name = new GooString (link_name);
 
 	if (g_link_name) {
 		link_dest = document->doc->findDest (g_link_name);

Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-page.cc,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- poppler-page.cc	24 Feb 2007 23:32:22 -0000	1.54
+++ poppler-page.cc	25 Apr 2007 19:59:10 -0000	1.55
@@ -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;