[poppler] poppler/OutputDev.h poppler/Page.cc poppler/PSOutputDev.cc poppler/PSOutputDev.h utils/HtmlOutputDev.h
Albert Astals Cid
aacid at kemper.freedesktop.org
Thu Mar 29 14:38:29 PDT 2012
poppler/OutputDev.h | 6 +++++-
poppler/PSOutputDev.cc | 11 ++++++++---
poppler/PSOutputDev.h | 5 ++++-
poppler/Page.cc | 3 ++-
utils/HtmlOutputDev.h | 5 ++++-
5 files changed, 23 insertions(+), 7 deletions(-)
New commits:
commit a5f4936dfb3e60ca37f932cc066aa10765f3cbc9
Author: Fabio D'Urso <fabiodurso at hotmail.it>
Date: Sat Mar 24 23:13:48 2012 +0100
Fix: annotDisplayDecideCbk was not propagated
diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index 7e51b9d..d739625 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -21,6 +21,7 @@
// Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2009 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger at googlemail.com>
+// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -39,6 +40,7 @@
#include "CharTypes.h"
#include "Object.h"
+class Annot;
class Dict;
class GooHash;
class GooString;
@@ -124,7 +126,9 @@ public:
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
GBool (* abortCheckCbk)(void *data) = NULL,
- void * abortCheckCbkData = NULL)
+ void * abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL)
{ return gTrue; }
// Start a page.
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 8fa8410..232c750 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -26,6 +26,7 @@
// Copyright (C) 2009, 2011, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
// Copyright (C) 2009-2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -3033,7 +3034,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
int sliceW, int sliceH,
GBool printing,
GBool (*abortCheckCbk)(void *data),
- void *abortCheckCbkData) {
+ void *abortCheckCbkData,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data),
+ void *annotDisplayDecideCbkData) {
PreScanOutputDev *scan;
GBool rasterize;
#if HAVE_SPLASH
@@ -3065,7 +3068,8 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
scan = new PreScanOutputDev(doc);
page->displaySlice(scan, 72, 72, rotateA, useMediaBox, crop,
sliceX, sliceY, sliceW, sliceH,
- printing, abortCheckCbk, abortCheckCbkData);
+ printing, abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
rasterize = scan->usesTransparency() || scan->usesPatternImageMask();
delete scan;
}
@@ -3148,7 +3152,8 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
page->displaySlice(splashOut, hDPI2, vDPI2,
(360 - page->getRotate()) % 360, useMediaBox, crop,
sliceX, stripeY, sliceW, stripeH,
- printing, abortCheckCbk, abortCheckCbkData);
+ printing, abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData);
// draw the rasterized image
bitmap = splashOut->getBitmap();
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index 82f8dfa..751ad8e 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -23,6 +23,7 @@
// Copyright (C) 2009, 2011 William Bader <williambader at hotmail.com>
// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -178,7 +179,9 @@ public:
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
GBool (*abortCheckCbk)(void *data) = NULL,
- void *abortCheckCbkData = NULL);
+ void *abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL);
// Start a page.
virtual void startPage(int pageNum, GfxState *state);
diff --git a/poppler/Page.cc b/poppler/Page.cc
index b9d25ff..afd7bc1 100644
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -505,7 +505,8 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
if (!out->checkPageSlice(this, hDPI, vDPI, rotate, useMediaBox, crop,
sliceX, sliceY, sliceW, sliceH,
printing,
- abortCheckCbk, abortCheckCbkData)) {
+ abortCheckCbk, abortCheckCbkData,
+ annotDisplayDecideCbk, annotDisplayDecideCbkData)) {
return;
}
diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
index 2f35759..12b16bf 100644
--- a/utils/HtmlOutputDev.h
+++ b/utils/HtmlOutputDev.h
@@ -22,6 +22,7 @@
// Copyright (C) 2011 Joshua Richardson <jric at chegg.com>
// Copyright (C) 2011 Stephen Reichling <sreichling at chegg.com>
// Copyright (C) 2012 Igor Slepchin <igor.redhat at gmail.com>
+// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -268,7 +269,9 @@ public:
int sliceX, int sliceY, int sliceW, int sliceH,
GBool printing,
GBool (* abortCheckCbk)(void *data) = NULL,
- void * abortCheckCbkData = NULL)
+ void * abortCheckCbkData = NULL,
+ GBool (*annotDisplayDecideCbk)(Annot *annot, void *user_data) = NULL,
+ void *annotDisplayDecideCbkData = NULL)
{
docPage = page;
return gTrue;
More information about the poppler
mailing list