[poppler] poppler/Annot.cc poppler/Annot.h

[Pino Toscano]

 poppler/Annot.cc |   10 ++++------
 poppler/Annot.h  |    4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit bacc1dd9f37ff19c5e54878a5b08e7d734584bbf
Author: Pino Toscano <pino at kde.org>
Date:   Sat Apr 12 17:20:09 2008 +0200

    Read the "in reply to" reference as such, without reading the associated annotation dictionary.

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 1e82fd6..5bd9bbd 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -1098,9 +1098,6 @@ AnnotMarkup::~AnnotMarkup() {
   if (date)
     delete date;
 
-  if (inReplyTo)
-    delete inReplyTo;
-
   if (subject)
     delete subject;
 }
@@ -1136,10 +1133,11 @@ void AnnotMarkup::initialize(XRef *xrefA, Dict *dict, Catalog *catalog, Object *
   }
   obj1.free();
 
-  if (dict->lookup("IRT", &obj1)->isDict()) {
-    inReplyTo = obj1.getDict();
+  if (dict->lookupNF("IRT", &obj1)->isRef()) {
+    inReplyTo = obj1.getRef();
   } else {
-    inReplyTo = NULL;
+    inReplyTo.num = 0;
+    inReplyTo.gen = 0;
   }
   obj1.free();
 
diff --git a/poppler/Annot.h b/poppler/Annot.h
index 4001ab5..10a4c82 100644
--- a/poppler/Annot.h
+++ b/poppler/Annot.h
@@ -549,7 +549,7 @@ public:
   double getOpacity() const { return opacity; }
   // getRC
   GooString *getDate() const { return date; }
-  Dict *getInReplyTo() const { return inReplyTo; }
+  int getInReplyToID() const { return inReplyTo.num; }
   GooString *getSubject() const { return subject; }
   AnnotMarkupReplyType getReplyTo() const { return replyTo; }
   AnnotExternalDataType getExData() const { return exData; }
@@ -560,7 +560,7 @@ protected:
   double opacity;               // CA           (Default 1.0)
   // RC
   GooString *date;              // CreationDate
-  Dict *inReplyTo;              // IRT
+  Ref inReplyTo;                // IRT
   GooString *subject;           // Subj
   AnnotMarkupReplyType replyTo; // RT           (Default R)
   // this object is overrided by the custom intent fields defined in some