[poppler] poppler/poppler: Catalog.cc,1.12,1.13 Catalog.h,1.6,1.7

[Albert Astals Cid]

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

Modified Files:
	Catalog.cc Catalog.h 
Log Message:
Merge xpdf 3.00 -> xpdf 3.01 changes for Catalog.[cc|h]


Index: Catalog.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Catalog.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Catalog.cc	31 Aug 2005 15:28:46 -0000	1.12
+++ Catalog.cc	15 Sep 2005 12:52:36 -0000	1.13
@@ -148,6 +148,9 @@
   // get the outline dictionary
   catDict.dictLookup("Outlines", &outline);
 
+  // get the AcroForm dictionary
+  catDict.dictLookup("AcroForm", &acroForm);
+
   catDict.free();
   return;
 
@@ -182,6 +185,7 @@
   metadata.free();
   structTreeRoot.free();
   outline.free();
+  acroForm.free();
 }
 
 GooString *Catalog::readMetadata() {
@@ -259,7 +263,6 @@
     } else {
       error(-1, "Kid object (page %d) is wrong type (%s)",
 	    start+1, kid.getTypeName());
-      goto err2;
     }
     kid.free();
   }

Index: Catalog.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Catalog.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Catalog.h	7 Jul 2005 11:04:08 -0000	1.6
+++ Catalog.h	15 Sep 2005 12:52:36 -0000	1.7
@@ -100,6 +100,8 @@
 
   Object *getOutline() { return &outline; }
 
+  Object *getAcroForm() { return &acroForm; }
+
   enum PageMode {
     pageModeNone,
     pageModeOutlines,
@@ -135,6 +137,7 @@
   Object metadata;		// metadata stream
   Object structTreeRoot;	// structure tree root dictionary
   Object outline;		// outline dictionary
+  Object acroForm;		// AcroForm dictionary
   GBool ok;			// true if catalog is valid
   PageLabelInfo *pageLabelInfo; // info about page labels
   PageMode pageMode;		// page mode