1 files changed, 27 insertions, 13 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/Page.cc b/noncore/unsupported/qpdf/xpdf/Page.cc
index 17c4481..9cc08c4 100644
--- a/noncore/unsupported/qpdf/xpdf/Page.cc
+++ b/noncore/unsupported/qpdf/xpdf/Page.cc
@@ -1,47 +1,47 @@
 //========================================================================
 //
 // Page.cc
 //
-// Copyright 1996 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifdef __GNUC__
 #pragma implementation
 #endif
 
 #include <aconf.h>
 #include <stddef.h>
 #include "Object.h"
 #include "Array.h"
 #include "Dict.h"
 #include "XRef.h"
 #include "Link.h"
 #include "OutputDev.h"
 #ifndef PDF_PARSER_ONLY
 #include "Gfx.h"
-#include "FormWidget.h"
+#include "Annot.h"
 #endif
 #include "Error.h"
 #include "Page.h"
 
 //------------------------------------------------------------------------
 // PageAttrs
 //------------------------------------------------------------------------
 
 PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
   Object obj1;
   fouble w, h;
 
   // get old/default values
   if (attrs) {
     mediaBox = attrs->mediaBox;
     cropBox = attrs->cropBox;
     haveCropBox = attrs->haveCropBox;
     rotate = attrs->rotate;
     attrs->resources.copy(&resources);
   } else {
     // set default MediaBox to 8.5" x 11" -- this shouldn't be necessary
     // but some (non-compliant) PDF files don't specify a MediaBox
     mediaBox.x1 = 0;
     mediaBox.y1 = 0;
@@ -72,58 +72,72 @@ PageAttrs::PageAttrs(PageAttrs *attrs, Dict *dict) {
     }
   }
 
   // other boxes
   bleedBox = cropBox;
   readBox(dict, "BleedBox", &bleedBox);
   trimBox = cropBox;
   readBox(dict, "TrimBox", &trimBox);
   artBox = cropBox;
   readBox(dict, "ArtBox", &artBox);
 
   // rotate
   dict->lookup("Rotate", &obj1);
   if (obj1.isInt()) {
     rotate = obj1.getInt();
   }
   obj1.free();
   while (rotate < 0) {
     rotate += 360;
   }
   while (rotate >= 360) {
     rotate -= 360;
   }
 
+  // misc attributes
+  dict->lookup("LastModified", &lastModified);
+  dict->lookup("BoxColorInfo", &boxColorInfo);
+  dict->lookup("Group", &group);
+  dict->lookup("Metadata", &metadata);
+  dict->lookup("PieceInfo", &pieceInfo);
+  dict->lookup("SeparationInfo", &separationInfo);
+
   // resource dictionary
   dict->lookup("Resources", &obj1);
   if (obj1.isDict()) {
     resources.free();
     obj1.copy(&resources);
   }
   obj1.free();
 }
 
 PageAttrs::~PageAttrs() {
+  lastModified.free();
+  boxColorInfo.free();
+  group.free();
+  metadata.free();
+  pieceInfo.free();
+  separationInfo.free();
   resources.free();
 }
 
 GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) {
   PDFRectangle tmp;
   Object obj1, obj2;
   GBool ok;
 
   dict->lookup(key, &obj1);
   if (obj1.isArray() && obj1.arrayGetLength() == 4) {
     ok = gTrue;
     obj1.arrayGet(0, &obj2);
     if (obj2.isNum()) {
       tmp.x1 = obj2.getNum();
     } else {
       ok = gFalse;
     }
     obj2.free();
     obj1.arrayGet(1, &obj2);
     if (obj2.isNum()) {
       tmp.y1 = obj2.getNum();
     } else {
       ok = gFalse;
     }
@@ -188,80 +202,80 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA,
 
   return;
 
  err2:
   annots.initNull();
  err1:
   contents.initNull();
   ok = gFalse;
 }
 
 Page::~Page() {
   delete attrs;
   annots.free();
   contents.free();
 }
 
 void Page::display(OutputDev *out, fouble dpi, int rotate,
 		   Links *links, Catalog *catalog) {
 #ifndef PDF_PARSER_ONLY
   PDFRectangle *box, *cropBox;
   Gfx *gfx;
   Object obj;
   Link *link;
   int i;
-  FormWidgets *formWidgets;
+  Annots *annotList;
 
   box = getBox();
   cropBox = getCropBox();
 
   if (printCommands) {
     printf("***** MediaBox = ll:%g,%g ur:%g,%g\n",
 	   box->x1, box->y1, box->x2, box->y2);
     if (isCropped()) {
       printf("***** CropBox = ll:%g,%g ur:%g,%g\n",
 	     cropBox->x1, cropBox->y1, cropBox->x2, cropBox->y2);
     }
     printf("***** Rotate = %d\n", attrs->getRotate());
   }
 
   rotate += getRotate();
   if (rotate >= 360) {
     rotate -= 360;
   } else if (rotate < 0) {
     rotate += 360;
   }
   gfx = new Gfx(xref, out, num, attrs->getResourceDict(),
 		dpi, box, isCropped(), cropBox, rotate, printCommands);
   contents.fetch(xref, &obj);
   if (!obj.isNull()) {
     gfx->display(&obj);
   }
   obj.free();
 
   // draw links
   if (links) {
     for (i = 0; i < links->getNumLinks(); ++i) {
       link = links->getLink(i);
       out->drawLink(link, catalog);
     }
     out->dump();
   }
 
-  // draw AcroForm widgets
+  // draw non-link annotations
   //~ need to reset CTM ???
-  formWidgets = new FormWidgets(xref, annots.fetch(xref, &obj));
+  annotList = new Annots(xref, annots.fetch(xref, &obj));
   obj.free();
-  if (printCommands && formWidgets->getNumWidgets() > 0) {
-    printf("***** AcroForm widgets\n");
-  }
-  for (i = 0; i < formWidgets->getNumWidgets(); ++i) {
-    formWidgets->getWidget(i)->draw(gfx);
-  }
-  if (formWidgets->getNumWidgets() > 0) {
+  if (annotList->getNumAnnots() > 0) {
+    if (printCommands) {
+      printf("***** Annotations\n");
+    }
+    for (i = 0; i < annotList->getNumAnnots(); ++i) {
+      annotList->getAnnot(i)->draw(gfx);
+    }
     out->dump();
   }
-  delete formWidgets;
+  delete annotList;
 
   delete gfx;
 #endif
 }