[poppler] Branch 'poppler-0.24' - 2 commits - poppler/Catalog.cc poppler/Catalog.h utils/pdfinfo.cc

[Albert Astals Cid]

 poppler/Catalog.cc |   45 ---------------------------------------------
 poppler/Catalog.h  |   10 ----------
 utils/pdfinfo.cc   |    8 ++------
 3 files changed, 2 insertions(+), 61 deletions(-)

New commits:
commit fbea2241cccdde0106d2c34592b6ddda28a8d848
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Aug 17 01:32:51 2013 +0200

    Revert "Tagged-PDF: Accessors in Catalog for the MarkInfo dictionary"
    
    This reverts commit 402ee8b4e31630a42a0a38db1d39164cc5789f3c.
    
    No clue how this ended up in the stable branch

diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 25a8997..6bd511a 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -97,7 +97,6 @@ Catalog::Catalog(PDFDoc *docA) {
   attrsList = NULL;
   kidsIdxList = NULL;
   lastCachedPage = 0;
-  markInfo = markInfoNull;
 
   xref->getCatalog(&catDict);
   if (!catDict.isDict()) {
@@ -858,50 +857,6 @@ Object *Catalog::getStructTreeRoot()
   return &structTreeRoot;
 }
 
-Guint Catalog::getMarkInfo()
-{
-  if (markInfo == markInfoNull) {
-    markInfo = 0;
-
-    Object catDict;
-    catalogLocker();
-    xref->getCatalog(&catDict);
-
-    if (catDict.isDict()) {
-      Object markInfoDict;
-      catDict.dictLookup("MarkInfo", &markInfoDict);
-      if (markInfoDict.isDict()) {
-        Object value;
-
-        if (markInfoDict.dictLookup("Marked", &value)->isBool() && value.getBool())
-          markInfo |= markInfoMarked;
-        else if (!value.isNull())
-          error(errSyntaxError, -1, "Marked object is wrong type ({0:s})", value.getTypeName());
-        value.free();
-
-        if (markInfoDict.dictLookup("Suspects", &value)->isBool() && value.getBool())
-          markInfo |= markInfoSuspects;
-        else if (!value.isNull())
-          error(errSyntaxError, -1, "Suspects object is wrong type ({0:s})", value.getTypeName());
-        value.free();
-
-        if (markInfoDict.dictLookup("UserProperties", &value)->isBool() && value.getBool())
-          markInfo |= markInfoUserProperties;
-        else if (!value.isNull())
-          error(errSyntaxError, -1, "UserProperties object is wrong type ({0:s})", value.getTypeName());
-        value.free();
-      } else if (!markInfoDict.isNull()) {
-        error(errSyntaxError, -1, "MarkInfo object is wrong type ({0:s})", markInfoDict.getTypeName());
-      }
-      markInfoDict.free();
-    } else {
-      error(errSyntaxError, -1, "Catalog object is wrong type ({0:s})", catDict.getTypeName());
-    }
-    catDict.free();
-  }
-  return markInfo;
-}
-
 Object *Catalog::getOutline()
 {
   catalogLocker();
diff --git a/poppler/Catalog.h b/poppler/Catalog.h
index a89d9aa..24a3dcf 100644
--- a/poppler/Catalog.h
+++ b/poppler/Catalog.h
@@ -125,15 +125,6 @@ public:
   // Return the structure tree root object.
   Object *getStructTreeRoot();
 
-  // Return values from the MarkInfo dictionary as flags in a bitfield.
-  enum MarkInfoFlags {
-    markInfoNull           = 1 << 0,
-    markInfoMarked         = 1 << 1,
-    markInfoUserProperties = 1 << 2,
-    markInfoSuspects       = 1 << 3,
-  };
-  Guint getMarkInfo();
-
   // Find a page, given its object ID.  Returns page number, or 0 if
   // not found.
   int findPage(int num, int gen);
@@ -228,7 +219,6 @@ private:
   GooString *baseURI;		// base URI for URI-type links
   Object metadata;		// metadata stream
   Object structTreeRoot;	// structure tree root dictionary
-  Guint markInfo;               // Flags from MarkInfo dictionary
   Object outline;		// outline dictionary
   Object acroForm;		// AcroForm dictionary
   Object viewerPreferences;     // ViewerPreference dictionary
commit 6d2771b8a8c0cb0f2288d0900fea3c9edc3dd172
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Aug 17 01:32:38 2013 +0200

    Revert "pdfinfo: Use Catalog::getMarkInfo() to show mark info properties"
    
    This reverts commit 73cca518c479594e26605196d54b429fbf42dcdc.
    
    No clue how this ended up in the stable branch

diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index f297614..14e4f6c 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -225,12 +225,8 @@ int main(int argc, char *argv[]) {
   info.free();
 
   // print tagging info
-   printf("Tagged:         %s\n",
-	  (doc->getCatalog()->getMarkInfo() & Catalog::markInfoMarked) ? "yes" : "no");
-   printf("UserProperties: %s\n",
-	  (doc->getCatalog()->getMarkInfo() & Catalog::markInfoUserProperties) ? "yes" : "no");
-   printf("Suspects:       %s\n",
-	  (doc->getCatalog()->getMarkInfo() & Catalog::markInfoSuspects) ? "yes" : "no");
+  printf("Tagged:         %s\n",
+	 doc->getStructTreeRoot()->isDict() ? "yes" : "no");
 
   // print form info
   switch (doc->getCatalog()->getFormType())