[poppler] poppler/glib: poppler-action.cc, 1.10, 1.10.2.1 poppler-document.cc, 1.41, 1.41.2.1

[Albert Astals Cid]

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

Modified Files:
      Tag: xpdf302merge
	poppler-action.cc poppler-document.cc 
Log Message:
The big xpdf 3.02 merge, it's mostly working except
Annot has still to be merged, i'll leave that to jrebetez
DCTStream and FlateStream classes have not been tested
ArthurOutputDev had some code commented, but as it was nto working it's not crucial
UGooString got removed as i got clear it was not needed, yay!
HtmlOutputDev won't detect links as the base outputdev changed signature
Did not test CairoOutputDev but i have 0 knowledge of Cairo so i need someone here anyway
glib frontend has some nasty warnings probably due to changed signatures, have a look
And in all i'm quite happy of the merge as it renders "something" and my kpdf port all it had was crashes :D


Index: poppler-action.cc
===================================================================
RCS file: /cvs/poppler/poppler/glib/poppler-action.cc,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- poppler-action.cc	28 Jan 2007 15:55:11 -0000	1.10
+++ poppler-action.cc	6 Apr 2007 14:22:23 -0000	1.10.2.1
@@ -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;
@@ -293,7 +291,7 @@
 		 LinkGoTo        *link)
 {
 	LinkDest *link_dest;
-	UGooString *named_dest;
+	GooString *named_dest;
 
 	/* Return if it isn't OK */
 	if (! link->isOk ()) {
@@ -318,7 +316,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.41.2.1
diff -u -d -r1.41 -r1.41.2.1
--- poppler-document.cc	24 Feb 2007 23:43:35 -0000	1.41
+++ poppler-document.cc	6 Apr 2007 14:22:23 -0000	1.41.2.1
@@ -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);