@@ -37,6 +37,7 @@ #include <stdlib.h> #include <math.h> +#include <assert.h> #include "goo/gmem.h" #include "GooList.h" #include "Error.h" @@ -612,6 +613,32 @@ AnnotColor::AnnotColor() { values = NULL; } +AnnotColor::AnnotColor(double gray) { + length = 1; + values = (double *) gmallocn (length, sizeof(double)); + + values[0] = gray; +} + +AnnotColor::AnnotColor(double r, double g, double b) { + length = 3; + values = (double *) gmallocn (length, sizeof(double)); + + values[0] = r; + values[1] = g; + values[2] = b; +} + +AnnotColor::AnnotColor(double c, double m, double y, double k) { + length = 4; + values = (double *) gmallocn (length, sizeof(double)); + + values[0] = c; + values[1] = m; + values[2] = y; + values[3] = k; +} + AnnotColor::AnnotColor(Array *array) { // TODO: check what Acrobat does in the case of having more than 5 numbers. if (array->getLength() < 5) { @@ -814,10 +841,35 @@ AnnotAppearanceCharacs::~AnnotAppearanceCharacs() { // Annot //------------------------------------------------------------------------ +Annot::Annot(XRef *xrefA, PDFRectangle *rectA, Catalog *catalog) { + Object obj1; + + flags = flagUnknown; + type = typeUnknown; + + obj1.initArray (xrefA); + Object obj2; + obj1.arrayAdd (obj2.initReal (rectA->x1)); + obj1.arrayAdd (obj2.initReal (rectA->y1)); + obj1.arrayAdd (obj2.initReal (rectA->x2)); + obj1.arrayAdd (obj2.initReal (rectA->y2)); + obj2.free (); + + annotObj.initDict (xrefA); + annotObj.dictSet ("Type", obj2.initName ("Annot")); + annotObj.dictSet ("Rect", &obj1); + // obj1 is owned by the dict + + ref = xrefA->addIndirectObject (&annotObj); + + initialize (xrefA, annotObj.getDict(), catalog); +} + Annot::Annot(XRef *xrefA, Dict *dict, Catalog* catalog) { hasRef = false; flags = flagUnknown; type = typeUnknown; + annotObj.initDict (dict); initialize (xrefA, dict, catalog); } @@ -830,6 +882,7 @@ Annot::Annot(XRef *xrefA, Dict *dict, Catalog* catalog, Object *obj) { } flags = flagUnknown; type = typeUnknown; + annotObj.initDict (dict); initialize (xrefA, dict, catalog); } @@ -842,7 +895,6 @@ void Annot::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) { xref = xrefA; appearBuf = NULL; fontSize = 0; - annotObj.initDict (dict); //----- parse the rectangle rect = new PDFRectangle(); @@ -1018,7 +1070,24 @@ void Annot::setContents(GooString *new_content) { obj1.initString(contents->copy()); update ("Contents", &obj1); } - + +void Annot::setColor(AnnotColor *new_color) { + delete color; + + if (new_color) { + Object obj1, obj2; + double *values = new_color->getValues(); + + obj1.initArray(xref); + for (int i = 0; i < (int)new_color->getSpace(); i++) + obj1.arrayAdd(obj2.initReal (values[i])); + update ("C", &obj1); + color = new_color; + } else { + color = NULL; + } +} + double Annot::getXMin() { return rect->x1; } @@ -1220,6 +1289,16 @@ void Annot::draw(Gfx *gfx, GBool printing) { // AnnotPopup //------------------------------------------------------------------------ +AnnotPopup::AnnotPopup(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + Object obj1; + + type = typePopup; + + annotObj.dictSet ("Subtype", obj1.initName ("Popup")); + initialize (xrefA, annotObj.getDict(), catalog); +} + AnnotPopup::AnnotPopup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { type = typePopup; @@ -1227,22 +1306,16 @@ AnnotPopup::AnnotPopup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : } AnnotPopup::~AnnotPopup() { - /* - if (parent) - delete parent; - */ + parent.free(); } void AnnotPopup::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) { Object obj1; - /* - if (dict->lookup("Parent", &obj1)->isDict()) { - parent = NULL; - } else { - parent = NULL; + + if (!dict->lookupNF("Parent", &parent)->isRef()) { + parent.initNull(); } - obj1.free(); - */ + if (dict->lookup("Open", &obj1)->isBool()) { open = obj1.getBool(); } else { @@ -1251,10 +1324,33 @@ void AnnotPopup::initialize(XRef *xrefA, Dict *dict, Catalog *catalog) { obj1.free(); } +void AnnotPopup::setParent(Object *parentA) { + parentA->copy(&parent); + update ("Parent", &parent); +} + +void AnnotPopup::setParent(Annot *parentA) { + Ref parentRef = parentA->getRef(); + parent.initRef(parentRef.num, parentRef.gen); + update ("Parent", &parent); +} + +void AnnotPopup::setOpen(GBool openA) { + Object obj1; + + open = openA; + obj1.initBool(open); + update ("Open", &obj1); +} + //------------------------------------------------------------------------ // AnnotMarkup //------------------------------------------------------------------------ - +AnnotMarkup::AnnotMarkup(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + initialize(xrefA, annotObj.getDict(), catalog, &annotObj); +} + AnnotMarkup::AnnotMarkup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { initialize(xrefA, dict, catalog, obj); @@ -1344,10 +1440,57 @@ void AnnotMarkup::initialize(XRef *xrefA, Dict *dict, Catalog *catalog, Object * obj1.free(); } +void AnnotMarkup::setLabel(GooString *new_label) { + delete label; + + if (new_label) { + label = new GooString(new_label); + //append the unicode marker <FE FF> if needed + if (!label->hasUnicodeMarker()) { + label->insert(0, 0xff); + label->insert(0, 0xfe); + } + } else { + label = new GooString(); + } + + Object obj1; + obj1.initString(label->copy()); + update ("T", &obj1); +} + +void AnnotMarkup::setPopup(AnnotPopup *new_popup) { + delete popup; + + if (new_popup) { + Object obj1; + Ref popupRef = new_popup->getRef(); + + obj1.initRef (popupRef.num, popupRef.gen); + update ("Popup", &obj1); + + new_popup->setParent(this); + popup = new_popup; + } else { + popup = NULL; + } +} + //------------------------------------------------------------------------ // AnnotText //------------------------------------------------------------------------ +AnnotText::AnnotText(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeText; + flags |= flagNoZoom | flagNoRotate; + + annotObj.dictSet ("Subtype", obj1.initName ("Text")); + initialize (xrefA, catalog, annotObj.getDict()); +} + AnnotText::AnnotText(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -1441,9 +1584,42 @@ void AnnotText::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) { obj1.free(); } +void AnnotText::setOpen(GBool openA) { + Object obj1; + + open = openA; + obj1.initBool(open); + update ("Open", &obj1); +} + +void AnnotText::setIcon(GooString *new_icon) { + if (new_icon && icon->cmp(new_icon) == 0) + return; + + delete icon; + + if (new_icon) { + icon = new GooString (new_icon); + } else { + icon = new GooString("Note"); + } + + Object obj1; + obj1.initName (icon->getCString()); + update("Name", &obj1); +} + //------------------------------------------------------------------------ // AnnotLink //------------------------------------------------------------------------ +AnnotLink::AnnotLink(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + Object obj1; + + type = typeLink; + annotObj.dictSet ("Subtype", obj1.initName ("Link")); + initialize (xrefA, catalog, annotObj.getDict()); +} AnnotLink::AnnotLink(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { @@ -1532,6 +1708,20 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) { //------------------------------------------------------------------------ // AnnotFreeText //------------------------------------------------------------------------ +AnnotFreeText::AnnotFreeText(XRef *xrefA, PDFRectangle *rect, GooString *da, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeFreeText; + + annotObj.dictSet ("Subtype", obj1.initName ("FreeText")); + + Object obj2; + obj2.initString (da->copy()); + annotObj.dictSet("DA", &obj2); + + initialize (xrefA, catalog, annotObj.getDict()); +} AnnotFreeText::AnnotFreeText(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -1655,6 +1845,24 @@ void AnnotFreeText::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) { // AnnotLine //------------------------------------------------------------------------ +AnnotLine::AnnotLine(XRef *xrefA, PDFRectangle *rect, PDFRectangle *lRect, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeLine; + annotObj.dictSet ("Subtype", obj1.initName ("Line")); + + Object obj2, obj3; + obj2.initArray (xrefA); + obj2.arrayAdd (obj3.initReal (lRect->x1)); + obj2.arrayAdd (obj3.initReal (lRect->y1)); + obj2.arrayAdd (obj3.initReal (lRect->x2)); + obj2.arrayAdd (obj3.initReal (lRect->y2)); + annotObj.dictSet ("L", &obj2); + + initialize (xrefA, catalog, annotObj.getDict()); +} + AnnotLine::AnnotLine(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { type = typeLine; @@ -1814,6 +2022,48 @@ void AnnotLine::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) { //------------------------------------------------------------------------ // AnnotTextMarkup //------------------------------------------------------------------------ +AnnotTextMarkup::AnnotTextMarkup(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, + AnnotQuadrilaterals *quadPoints, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + switch (subType) { + case typeHighlight: + annotObj.dictSet ("Subtype", obj1.initName ("Highlight")); + break; + case typeUnderline: + annotObj.dictSet ("Subtype", obj1.initName ("Underline")); + break; + case typeSquiggly: + annotObj.dictSet ("Subtype", obj1.initName ("Squiggly")); + break; + case typeStrikeOut: + annotObj.dictSet ("Subtype", obj1.initName ("StrikeOut")); + break; + default: + assert (0 && "Invalid subtype for AnnotTextMarkup\n"); + } + + Object obj2; + obj2.initArray (xrefA); + + for (int i = 0; i < quadPoints->getQuadrilateralsLength(); ++i) { + Object obj3; + + obj2.arrayAdd (obj3.initReal (quadPoints->getX1(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getY1(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getX2(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getY2(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getX3(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getY3(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getX4(i))); + obj2.arrayAdd (obj3.initReal (quadPoints->getY4(i))); + } + + annotObj.dictSet ("QuadPoints", &obj2); + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotTextMarkup::AnnotTextMarkup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3208,7 +3458,19 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) { //------------------------------------------------------------------------ // AnnotMovie //------------------------------------------------------------------------ - +AnnotMovie::AnnotMovie(XRef *xrefA, PDFRectangle *rect, Movie *movieA, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + Object obj1; + + type = typeMovie; + annotObj.dictSet ("Subtype", obj1.initName ("Movie")); + + movie = movieA->copy(); + // TODO: create movie dict from movieA + + initialize(xrefA, catalog, annotObj.getDict()); +} + AnnotMovie::AnnotMovie(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { type = typeMovie; @@ -3473,7 +3735,16 @@ void AnnotMovie::getZoomFactor(int& num, int& denum) { //------------------------------------------------------------------------ // AnnotScreen //------------------------------------------------------------------------ - +AnnotScreen::AnnotScreen(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + Object obj1; + + type = typeScreen; + + annotObj.dictSet ("Subtype", obj1.initName ("Screen")); + initialize(xrefA, catalog, annotObj.getDict()); +} + AnnotScreen::AnnotScreen(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { type = typeScreen; @@ -3514,7 +3785,15 @@ void AnnotScreen::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotStamp //------------------------------------------------------------------------ - +AnnotStamp::AnnotStamp(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeStamp; + annotObj.dictSet ("Subtype", obj1.initName ("Stamp")); + initialize(xrefA, catalog, annotObj.getDict()); +} + AnnotStamp::AnnotStamp(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { type = typeStamp; @@ -3540,6 +3819,23 @@ void AnnotStamp::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotGeometry //------------------------------------------------------------------------ +AnnotGeometry::AnnotGeometry(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + switch (subType) { + case typeSquare: + annotObj.dictSet ("Subtype", obj1.initName ("Square")); + break; + case typeCircle: + annotObj.dictSet ("Subtype", obj1.initName ("Circle")); + break; + default: + assert (0 && "Invalid subtype for AnnotGeometry\n"); + } + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotGeometry::AnnotGeometry(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3592,6 +3888,36 @@ void AnnotGeometry::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotPolygon //------------------------------------------------------------------------ +AnnotPolygon::AnnotPolygon(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, + AnnotPath *path, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + switch (subType) { + case typePolygon: + annotObj.dictSet ("Subtype", obj1.initName ("Polygon")); + break; + case typePolyLine: + annotObj.dictSet ("Subtype", obj1.initName ("PolyLine")); + break; + default: + assert (0 && "Invalid subtype for AnnotGeometry\n"); + } + + Object obj2; + obj2.initArray (xrefA); + + for (int i = 0; i < path->getCoordsLength(); ++i) { + Object obj3; + + obj2.arrayAdd (obj3.initReal (path->getX(i))); + obj2.arrayAdd (obj3.initReal (path->getY(i))); + } + + annotObj.dictSet ("Vertices", &obj2); + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotPolygon::AnnotPolygon(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3686,6 +4012,15 @@ void AnnotPolygon::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotCaret //------------------------------------------------------------------------ +AnnotCaret::AnnotCaret(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeCaret; + + annotObj.dictSet ("Subtype", obj1.initName ("Caret")); + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotCaret::AnnotCaret(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3723,6 +4058,36 @@ void AnnotCaret::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotInk //------------------------------------------------------------------------ +AnnotInk::AnnotInk(XRef *xrefA, PDFRectangle *rect, AnnotPath **paths, int n_paths, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeInk; + + annotObj.dictSet ("Subtype", obj1.initName ("Ink")); + + Object obj2; + obj2.initArray (xrefA); + + for (int i = 0; i < n_paths; ++i) { + AnnotPath *path = paths[i]; + Object obj3; + obj3.initArray (xrefA); + + for (int j = 0; j < path->getCoordsLength(); ++j) { + Object obj4; + + obj3.arrayAdd (obj4.initReal (path->getX(j))); + obj3.arrayAdd (obj4.initReal (path->getY(j))); + } + + obj2.arrayAdd (&obj3); + } + + annotObj.dictSet ("InkList", &obj2); + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotInk::AnnotInk(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3764,6 +4129,20 @@ void AnnotInk::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // AnnotFileAttachment //------------------------------------------------------------------------ +AnnotFileAttachment::AnnotFileAttachment(XRef *xrefA, PDFRectangle *rect, GooString *filename, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeFileAttachment; + + annotObj.dictSet ("Subtype", obj1.initName ("FileAttachment")); + + Object obj2; + obj2.initString(filename->copy()); + annotObj.dictSet ("FS", &obj2); + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotFileAttachment::AnnotFileAttachment(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3781,7 +4160,7 @@ AnnotFileAttachment::~AnnotFileAttachment() { void AnnotFileAttachment::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { Object obj1; - if (dict->lookup("FS", &obj1)->isDict()) { + if (dict->lookup("FS", &obj1)->isDict() || dict->lookup("FS", &obj1)->isString()) { obj1.copy(&file); } else { error(-1, "Bad Annot File Attachment"); @@ -3800,6 +4179,22 @@ void AnnotFileAttachment::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) //------------------------------------------------------------------------ // AnnotSound //------------------------------------------------------------------------ +AnnotSound::AnnotSound(XRef *xrefA, PDFRectangle *rect, Sound *soundA, Catalog *catalog) : + AnnotMarkup(xrefA, rect, catalog) { + Object obj1; + + type = typeSound; + + annotObj.dictSet ("Subtype", obj1.initName ("Sound")); + + Object obj2; + Stream *str = soundA->getStream(); + obj2.initStream (str); + str->incRef(); //FIXME: initStream should do this? + annotObj.dictSet ("Sound", &obj2); + + initialize(xrefA, catalog, annotObj.getDict()); +} AnnotSound::AnnotSound(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : AnnotMarkup(xrefA, dict, catalog, obj) { @@ -3834,6 +4229,16 @@ void AnnotSound::initialize(XRef *xrefA, Catalog *catalog, Dict* dict) { //------------------------------------------------------------------------ // Annot3D //------------------------------------------------------------------------ +Annot3D::Annot3D(XRef *xrefA, PDFRectangle *rect, Catalog *catalog) : + Annot(xrefA, rect, catalog) { + Object obj1; + + type = type3D; + + annotObj.dictSet ("Subtype", obj1.initName ("3D")); + + initialize(xrefA, catalog, annotObj.getDict()); +} Annot3D::Annot3D(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj) : Annot(xrefA, dict, catalog, obj) { poppler/Annot.cc @@ -287,6 +287,9 @@ public: }; AnnotColor(); + AnnotColor(double gray); + AnnotColor(double r, double g, double b); + AnnotColor(double c, double m, double y, double k); AnnotColor(Array *array); ~AnnotColor(); @@ -480,7 +483,8 @@ public: type3D // 3D 25 }; - Annot(XRef *xrefA, Dict *dict, Catalog* catalog); + Annot(XRef *xrefA, PDFRectangle *rectA, Catalog *catalog); + Annot(XRef *xrefA, Dict *dict, Catalog *catalog); Annot(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); virtual ~Annot(); GBool isOk() { return ok; } @@ -500,8 +504,13 @@ public: // Sets the annot contents to new_content // new_content should never be NULL void setContents(GooString *new_content); - + + // The annotation takes the ownership of + // new_color. + void setColor(AnnotColor *new_color); + // getters + Ref getRef() const { return ref; } AnnotSubtype getType() const { return type; } PDFRectangle *getRect() const { return rect; } GooString *getContents() const { return contents; } @@ -572,16 +581,21 @@ protected: class AnnotPopup: public Annot { public: + AnnotPopup(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotPopup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotPopup(); - Dict *getParent() const { return parent; } + Object *getParent(Object *obj) { return parent.fetch (xref, obj); } + Object *getParentNF(Object *obj) { return &parent; } + void setParent(Object *parentA); + void setParent(Annot *parentA); GBool getOpen() const { return open; } + void setOpen(GBool openA); protected: void initialize(XRef *xrefA, Dict *dict, Catalog *catalog); - Dict *parent; // Parent + Object parent; // Parent GBool open; // Open }; @@ -596,6 +610,7 @@ public: replyTypeGroup // Group }; + AnnotMarkup(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotMarkup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); virtual ~AnnotMarkup(); @@ -610,6 +625,10 @@ public: AnnotMarkupReplyType getReplyTo() const { return replyTo; } AnnotExternalDataType getExData() const { return exData; } + // The annotation takes the ownership of new_popup + void setPopup(AnnotPopup *new_popup); + void setLabel(GooString *new_label); + protected: GooString *label; // T (Default autor) AnnotPopup *popup; // Popup @@ -647,6 +666,7 @@ public: stateNone // None }; + AnnotText(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotText(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotText(); @@ -655,6 +675,9 @@ public: GooString *getIcon() const { return icon; } AnnotTextState getState() const { return state; } + void setOpen(GBool openA); + void setIcon(GooString *new_icon); + private: void initialize(XRef *xrefA, Catalog *catalog, Dict *dict); @@ -693,6 +716,7 @@ class AnnotMovie: public Annot { int units_per_second; // 0 : defined by movie }; + AnnotMovie(XRef *xrefA, PDFRectangle *rect, Movie *movieA, Catalog *catalog); AnnotMovie(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotMovie(); @@ -766,6 +790,7 @@ class AnnotMovie: public Annot { class AnnotScreen: public Annot { public: + AnnotScreen(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotScreen(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotScreen(); @@ -801,6 +826,7 @@ public: effectPush // P }; + AnnotLink(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotLink(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); virtual ~AnnotLink(); @@ -844,6 +870,7 @@ public: intentFreeTextTypeWriter // FreeTextTypeWriter }; + AnnotFreeText(XRef *xrefA, PDFRectangle *rect, GooString *da, Catalog *catalog); AnnotFreeText(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotFreeText(); @@ -895,6 +922,7 @@ public: captionPosTop // Top }; + AnnotLine(XRef *xrefA, PDFRectangle *rect, PDFRectangle *lRect, Catalog *catalog); AnnotLine(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotLine(); @@ -947,6 +975,8 @@ protected: class AnnotTextMarkup: public AnnotMarkup { public: + AnnotTextMarkup(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, + AnnotQuadrilaterals *quadPoints, Catalog *catalog); AnnotTextMarkup(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); virtual ~AnnotTextMarkup(); @@ -966,6 +996,7 @@ protected: class AnnotStamp: public AnnotMarkup { public: + AnnotStamp(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotStamp(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotStamp(); @@ -986,6 +1017,7 @@ private: class AnnotGeometry: public AnnotMarkup { public: + AnnotGeometry(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, Catalog *catalog); AnnotGeometry(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotGeometry(); @@ -1016,6 +1048,8 @@ public: polygonDimension // PolygonDimension }; + AnnotPolygon(XRef *xrefA, PDFRectangle *rect, AnnotSubtype subType, + AnnotPath *path, Catalog *catalog); AnnotPolygon(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotPolygon(); @@ -1057,6 +1091,7 @@ public: symbolP // P }; + AnnotCaret(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); AnnotCaret(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotCaret(); @@ -1079,6 +1114,7 @@ private: class AnnotInk: public AnnotMarkup { public: + AnnotInk(XRef *xrefA, PDFRectangle *rect, AnnotPath **paths, int n_paths, Catalog *catalog); AnnotInk(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotInk(); @@ -1106,6 +1142,7 @@ private: class AnnotFileAttachment: public AnnotMarkup { public: + AnnotFileAttachment(XRef *xrefA, PDFRectangle *rect, GooString *filename, Catalog *catalog); AnnotFileAttachment(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotFileAttachment(); @@ -1131,6 +1168,7 @@ private: class AnnotSound: public AnnotMarkup { public: + AnnotSound(XRef *xrefA, PDFRectangle *rect, Sound *soundA, Catalog *catalog); AnnotSound(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~AnnotSound(); @@ -1251,6 +1289,7 @@ class Annot3D: public Annot { }; public: + Annot3D(XRef *xrefA, PDFRectangle *rect, Catalog *catalog); Annot3D(XRef *xrefA, Dict *dict, Catalog *catalog, Object *obj); ~Annot3D(); poppler/Annot.h @@ -309,7 +309,7 @@ int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, kids.arrayGet(i, &kid); if (kid.isDict("Page")) { attrs2 = new PageAttrs(attrs1, kid.getDict()); - page = new Page(xref, start+1, kid.getDict(), attrs2, form); + page = new Page(xref, start+1, kid.getDict(), kidRef.getRef(), attrs2, form); if (!page->isOk()) { ++start; goto err3; poppler/Catalog.cc @@ -1024,6 +1024,16 @@ class PostScriptFunctionKey : public PopplerCacheKey public: PostScriptFunctionKey(int sizeA, double *inA, bool copyA) { + init(sizeA, inA, copyA); + } + + PostScriptFunctionKey(const PostScriptFunctionKey &key) + { + init(key.size, key.in, key.copied); + } + + void init(int sizeA, double *inA, bool copyA) + { copied = copyA; size = sizeA; if (copied) { @@ -1063,6 +1073,16 @@ class PostScriptFunctionItem : public PopplerCacheItem public: PostScriptFunctionItem(int sizeA, double *outA) { + init(sizeA, outA); + } + + PostScriptFunctionItem(const PostScriptFunctionItem &item) + { + init(item.size, item.out); + } + + void init(int sizeA, double *outA) + { size = sizeA; out = new double[size]; for (int i = 0; i < size; ++i) out[i] = outA[i]; @@ -1138,6 +1158,14 @@ PostScriptFunction::PostScriptFunction(PostScriptFunction *func) { codeString = func->codeString->copy(); stack = new PSStack(); memcpy(stack, func->stack, sizeof(PSStack)); + + cache = new PopplerCache(func->cache->size()); + for (int i = 0; i < func->cache->numberOfItems(); ++i) + { + PostScriptFunctionKey *key = new PostScriptFunctionKey(*(PostScriptFunctionKey*)func->cache->key(i)); + PostScriptFunctionItem *item = new PostScriptFunctionItem(*(PostScriptFunctionItem*)func->cache->item(i)); + cache->put(key, item); + } } PostScriptFunction::~PostScriptFunction() { poppler/Function.cc @@ -1824,6 +1824,7 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat, GBool stroke, GBool eoFill) { GfxPatternColorSpace *patCS; GfxColorSpace *cs; + GfxColor color; GfxPath *savedPath; double xMin, yMin, xMax, yMax, x, y, x1, y1; double cxMin, cyMin, cxMax, cyMax; @@ -1886,21 +1887,25 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat, out->updateFillColorSpace(state); state->setStrokeColorSpace(cs->copy()); out->updateStrokeColorSpace(state); - state->setStrokeColor(state->getFillColor()); + if (stroke) { + state->setFillColor(state->getStrokeColor()); + } else { + state->setStrokeColor(state->getFillColor()); + } } else { - state->setFillColorSpace(new GfxDeviceGrayColorSpace()); + cs = new GfxDeviceGrayColorSpace(); + state->setFillColorSpace(cs); + cs->getDefaultColor(&color); + state->setFillColor(&color); out->updateFillColorSpace(state); state->setStrokeColorSpace(new GfxDeviceGrayColorSpace()); + state->setStrokeColor(&color); out->updateStrokeColorSpace(state); } state->setFillPattern(NULL); out->updateFillColor(state); state->setStrokePattern(NULL); out->updateStrokeColor(state); - if (!stroke) { - state->setLineWidth(0); - out->updateLineWidth(state); - } // clip to current path if (stroke) { @@ -1915,6 +1920,8 @@ void Gfx::doTilingPatternFill(GfxTilingPattern *tPat, } } state->clearPath(); + state->setLineWidth(0); + out->updateLineWidth(state); // get the clip region, check for empty state->getClipBBox(&cxMin, &cyMin, &cxMax, &cyMax); poppler/Gfx.cc @@ -252,7 +252,7 @@ GBool PageAttrs::readBox(Dict *dict, char *key, PDFRectangle *box) { // Page //------------------------------------------------------------------------ -Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) { +Page::Page(XRef *xrefA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrsA, Form *form) { Object tmp; ok = gTrue; @@ -261,6 +261,9 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) duration = -1; pageWidgets = NULL; + pageObj.initDict(pageDict); + pageRef = pageRefA; + // get attributes attrs = attrsA; @@ -334,6 +337,7 @@ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) Page::~Page() { delete pageWidgets; delete attrs; + pageObj.free(); annots.free(); contents.free(); trans.free(); @@ -350,6 +354,34 @@ Annots *Page::getAnnots(Catalog *catalog) { return annots; } +void Page::addAnnot(Annot *annot) { + Object obj1; + Object tmp; + Ref annotRef = annot->getRef (); + + if (annots.isNull()) { + Ref annotsRef; + // page doesn't have annots array, + // we have to create it + + obj1.initArray(xref); + obj1.arrayAdd(tmp.initRef (annotRef.num, annotRef.gen)); + tmp.free(); + + annotsRef = xref->addIndirectObject (&obj1); + annots.initRef(annotsRef.num, annotsRef.gen); + pageObj.dictSet ("Annots", &annots); + xref->setModifiedObject (&pageObj, pageRef); + } else { + getAnnots(&obj1); + if (obj1.isArray()) { + obj1.arrayAdd (tmp.initRef (annotRef.num, annotRef.gen)); + xref->setModifiedObject (&obj1, annots.getRef()); + } + obj1.free(); + } +} + Links *Page::getLinks(Catalog *catalog) { Links *links; Object obj; poppler/Page.cc @@ -126,7 +126,7 @@ class Page { public: // Constructor. - Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form); + Page(XRef *xrefA, int numA, Dict *pageDict, Ref pageRefA, PageAttrs *attrsA, Form *form); // Destructor. ~Page(); @@ -163,6 +163,8 @@ public: // Get annotations array. Object *getAnnots(Object *obj) { return annots.fetch(xref, obj); } + // Add a new annotation to the page + void addAnnot(Annot *annot); // Return a list of links. Links *getLinks(Catalog *catalog); @@ -235,6 +237,8 @@ public: private: XRef *xref; // the xref table for this PDF file + Object pageObj; // page dictionary + Ref pageRef; // page reference int num; // page number PageAttrs *attrs; // page attributes Object annots; // annotations array poppler/Page.h @@ -80,3 +80,23 @@ void PopplerCache::put(PopplerCacheKey *key, PopplerCacheItem *item) keys[0] = key; items[0] = item; } + +int PopplerCache::size() +{ + return cacheSize; +} + +int PopplerCache::numberOfItems() +{ + return lastValidCacheIndex + 1; +} + +PopplerCacheItem *PopplerCache::item(int index) +{ + return items[index]; +} + +PopplerCacheKey *PopplerCache::key(int index) +{ + return keys[index]; +} poppler/PopplerCache.cc @@ -36,8 +36,22 @@ class PopplerCache /* The key and item pointers ownership is taken by the cache */ void put(PopplerCacheKey *key, PopplerCacheItem *item); + + /* The max size of the cache */ + int size(); + + /* The number of items in the cache */ + int numberOfItems(); + + /* The n-th item in the cache */ + PopplerCacheItem *item(int index); + + /* The n-th key in the cache */ + PopplerCacheKey *key(int index); private: + PopplerCache(const PopplerCache &cache); // not allowed + PopplerCacheKey **keys; PopplerCacheItem **items; int lastValidCacheIndex; poppler/PopplerCache.h @@ -214,6 +214,8 @@ PdfInspector::analyze_page (int page) void *p; GtkWidget *label; char *text; + cairo_t *cr; + cairo_surface_t *surface; label = glade_xml_get_widget (xml, "pdf_total_label"); @@ -221,7 +223,15 @@ PdfInspector::analyze_page (int page) gtk_list_store_clear (GTK_LIST_STORE (model)); GooTimer timer; + surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, + doc->getPageCropWidth(page + 1), + doc->getPageCropHeight(page + 1)); + cr = cairo_create (surface); + cairo_surface_destroy (surface); + output->setCairo (cr); + cairo_destroy (cr); doc->displayPage (output, page + 1, 72, 72, 0, gFalse, gTrue, gTrue); + output->setCairo (NULL); // Total time; text = g_strdup_printf ("%g", timer.getElapsed ()); @@ -331,6 +341,7 @@ main (int argc, char *argv []) globalParams = new GlobalParams(); globalParams->setProfileCommands (true); + globalParams->setPrintCommands (true); if (argc == 2) file_name = argv[1]; test/pdf-inspector.cc 946e714e2c7b21852753a8acd5a6b50406c5214c d30b1013ea3ce45b5ea942fe7357c0fd07ff47f4 Kouhei Sutou kou@cozmixng.org http://github.com/kou/poppler-test/commit/4ced9418b86d64fdfca7c15e78d30813c115aa3e 4ced9418b86d64fdfca7c15e78d30813c115aa3e 2009-06-16T08:40:49-07:00 2009-06-16T08:40:49-07:00 Merge branch 'master' of ssh://git.freedesktop.org/git/poppler/poppler 7affef3363b51c7fa39a5e6db777f550bb8c2b14 Kouhei Sutou kou@cozmixng.org