[poppler] poppler/poppler: Catalog.cc,1.15,1.16

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv22433/poppler

Modified Files:
	Catalog.cc 
Log Message:
2006-08-05  Albert Astals Cid  <aacid at kde.org>

        * poppler/Catalog.cc: The name array can contain references to strings
        instead of stings themselves, or at least PDF of
        https://bugs.freedesktop.org/show_bug.cgi?id=7780 does. This makes it
        work with that file
        * qt4/src/poppler-embeddedfile.cc: Use UGooString for description



Index: Catalog.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Catalog.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Catalog.cc	8 May 2006 19:03:51 -0000	1.15
+++ Catalog.cc	5 Aug 2006 17:10:07 -0000	1.16
@@ -440,8 +440,16 @@
 
 NameTree::Entry::Entry(Array *array, int index) {
     GooString n;
-    if (!array->getString(index, &n) || !array->getNF(index + 1, &value))
-	error(-1, "Invalid page tree");
+    if (!array->getString(index, &n) || !array->getNF(index + 1, &value)) {
+      Object aux;
+      array->get(index, &aux);
+      if (aux.isString() && array->getNF(index + 1, &value) )
+      {
+        n.append(aux.getString());
+      }
+      else
+        error(-1, "Invalid page tree");
+    }
     name = new UGooString(n);
 }