FreeBSD Bugzilla – Attachment 212430 Details for
Bug 244827
[exp-run] Upgrade graphics/poppler to 0.86.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1
poppler-0.86.1.v1.diff (text/plain), 20.75 KB, created by
Tobias C. Berner
on 2020-03-15 15:39:35 UTC
(
hide
)
Description:
v1
Filename:
MIME Type:
Creator:
Tobias C. Berner
Created:
2020-03-15 15:39:35 UTC
Size:
20.75 KB
patch
obsolete
>diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile >index 94af2e1773ac..54800fa3d308 100644 >--- a/converters/pdf2djvu/Makefile >+++ b/converters/pdf2djvu/Makefile >@@ -1,8 +1,7 @@ > # $FreeBSD$ > > PORTNAME= pdf2djvu >-PORTVERSION= 0.9.13 >-PORTREVISION= 4 >+DISTVERSION= 0.9.17 > CATEGORIES= converters > MASTER_SITES= https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/ > >diff --git a/converters/pdf2djvu/distinfo b/converters/pdf2djvu/distinfo >index d9b42f98aa08..df91ddb5bf4a 100644 >--- a/converters/pdf2djvu/distinfo >+++ b/converters/pdf2djvu/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1571734947 >-SHA256 (pdf2djvu-0.9.13.tar.xz) = e0ab16d83129625c86df7c121eddf286458f63cb81ae791e5a76df10a3ab4c63 >-SIZE (pdf2djvu-0.9.13.tar.xz) = 296420 >+TIMESTAMP = 1584261683 >+SHA256 (pdf2djvu-0.9.17.tar.xz) = 2976a15344e569d7ba6a694f002e9970d0859edc2ad1b2726692e6c46969cfc4 >+SIZE (pdf2djvu-0.9.17.tar.xz) = 295280 >diff --git a/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch b/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch >deleted file mode 100644 >index c3b4c4781b08..000000000000 >--- a/converters/pdf2djvu/files/patch-gentoo_pdf2djvu-0.9.12-poppler-0.82-4.patch >+++ /dev/null >@@ -1,26 +0,0 @@ >-This patch doesn't come from Gentoo, but because there are already >-three unrelated patches that touch the same file, I'm following the >-naming convention so that it gets applied in the right order. >- >-Chase constness changes in the poppler API. >- >---- pdf2djvu.cc.orig 2019-10-27 19:16:30.654895000 +0000 >-+++ pdf2djvu.cc 2019-10-27 19:16:47.450786000 +0000 >-@@ -333,7 +333,7 @@ >- } >- >- void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height, >-- pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image) >-+ pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image) >- { >- if (is_foreground_color_map(color_map) || config.no_render) >- { >-@@ -376,7 +376,7 @@ >- bool interpretType3Chars() { return false; } >- >- void drawChar(pdf::gfx::State *state, double x, double y, double dx, double dy, double origin_x, double origin_y, >-- CharCode code, int n_bytes, Unicode *unistr, int length) >-+ CharCode code, int n_bytes, const Unicode *unistr, int length) >- { >- double pox, poy, pdx, pdy, px, py, pw, ph; >- x -= origin_x; y -= origin_y; >diff --git a/converters/pdf2djvu/files/patch-pdf-backend.cc b/converters/pdf2djvu/files/patch-pdf-backend.cc >deleted file mode 100644 >index f6dd392316b2..000000000000 >--- a/converters/pdf2djvu/files/patch-pdf-backend.cc >+++ /dev/null >@@ -1,66 +0,0 @@ >---- pdf-backend.cc.orig 2019-06-10 17:06:44 UTC >-+++ pdf-backend.cc >-@@ -48,7 +48,7 @@ >- * ====================== >- */ >- >--static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, const char *message) >-+static void poppler_error_handler_new(ErrorCategory category, pdf::Offset pos, const char *message) >- { >- std::string format; >- const char *category_name = _("PDF error"); >-@@ -94,6 +94,11 @@ static void poppler_error_handler(void *data, ErrorCat >- error_log << std::endl; >- } >- >-+static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, const char *message) >-+{ >-+ poppler_error_handler_new(category, pos, message); >-+} >-+ >- #if POPPLER_VERSION < 7000 >- static void poppler_error_handler(void *data, ErrorCategory category, pdf::Offset pos, char *message) >- { >-@@ -101,10 +106,26 @@ static void poppler_error_handler(void *data, ErrorCat >- } >- #endif >- >-+// for POPPLER_VERSION >= 8500: >-+template <typename T1, typename T2> static auto set_error_callback(T1 callback1, T2 callback2) -> decltype(setErrorCallback(callback2)) >-+{ >-+ setErrorCallback(callback2); >-+} >-+ >-+// for POPPLER_VERSION < 8500: >-+template <typename T1, typename T2> static auto set_error_callback(T1 callback1, T2 callback2) -> decltype(setErrorCallback(callback1, nullptr)) >-+{ >-+ setErrorCallback(callback1, nullptr); >-+} >-+ >- pdf::Environment::Environment() >- { >-- globalParams = new GlobalParams(); >-+ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams); >-+#if POPPLER_VERSION >= 7000 >-+ set_error_callback(poppler_error_handler, poppler_error_handler_new); >-+#else >- setErrorCallback(poppler_error_handler, nullptr); >-+#endif >- } >- >- void pdf::Environment::set_antialias(bool value) >-@@ -499,12 +520,11 @@ bool pdf::get_glyph(splash::Splash *splash, splash::Fo >- void pdf::Renderer::convert_path(pdf::gfx::State *state, splash::Path &splash_path) >- { >- /* Source was copied from <poppler/SplashOutputDev.c>. */ >-- pdf::gfx::Subpath *subpath; >-- pdf::gfx::Path *path = state->getPath(); >-+ auto path = state->getPath(); >- int n_subpaths = path->getNumSubpaths(); >- for (int i = 0; i < n_subpaths; i++) >- { >-- subpath = path->getSubpath(i); >-+ auto subpath = path->getSubpath(i); >- if (subpath->getNumPoints() > 0) >- { >- double x1, y1, x2, y2, x3, y3; >diff --git a/converters/pdf2djvu/files/patch-pdf-dpi.cc b/converters/pdf2djvu/files/patch-pdf-dpi.cc >deleted file mode 100644 >index e1be2fa9e1c0..000000000000 >--- a/converters/pdf2djvu/files/patch-pdf-dpi.cc >+++ /dev/null >@@ -1,11 +0,0 @@ >---- pdf-dpi.cc.orig 2019-10-27 19:10:07 UTC >-+++ pdf-dpi.cc >-@@ -34,7 +34,7 @@ class DpiGuessDevice : public pdf::OutputDevice (prote >- } >- >- virtual void drawImage(pdf::gfx::State *state, pdf::Object *object, pdf::Stream *stream, int width, int height, >-- pdf::gfx::ImageColorMap *color_map, bool interpolate, int *mask_colors, bool inline_image) >-+ pdf::gfx::ImageColorMap *color_map, bool interpolate, const int *mask_colors, bool inline_image) >- { >- this->process_image(state, width, height); >- } >diff --git a/converters/pdf2djvu/files/patch-pdf-unicode.cc b/converters/pdf2djvu/files/patch-pdf-unicode.cc >deleted file mode 100644 >index f02c7ada514f..000000000000 >--- a/converters/pdf2djvu/files/patch-pdf-unicode.cc >+++ /dev/null >@@ -1,25 +0,0 @@ >---- pdf-unicode.cc.orig 2019-10-27 19:19:18.837645000 +0000 >-+++ pdf-unicode.cc 2019-10-27 19:20:31.405700000 +0000 >-@@ -125,11 +125,11 @@ >- * =================== >- */ >- >--pdf::FullNFKC::FullNFKC(Unicode *unistr, int length) >-+pdf::FullNFKC::FullNFKC(const Unicode *unistr, int length) >- : data(nullptr), length_(0) >- { >- assert(length >= 0); >-- this->data = unicodeNormalizeNFKC(unistr, length, &this->length_, nullptr); >-+ this->data = unicodeNormalizeNFKC(const_cast<Unicode*>(unistr), length, &this->length_, nullptr); >- } >- >- pdf::FullNFKC::~FullNFKC() >-@@ -141,7 +141,7 @@ >- * ====================== >- */ >- >--pdf::MinimalNFKC::MinimalNFKC(Unicode *unistr, int length) >-+pdf::MinimalNFKC::MinimalNFKC(const Unicode *unistr, int length) >- { >- this->string.append(unistr, length); >- } >diff --git a/converters/pdf2djvu/files/patch-pdf-unicode.hh b/converters/pdf2djvu/files/patch-pdf-unicode.hh >deleted file mode 100644 >index 7e3f74493925..000000000000 >--- a/converters/pdf2djvu/files/patch-pdf-unicode.hh >+++ /dev/null >@@ -1,20 +0,0 @@ >---- pdf-unicode.hh.orig 2019-10-27 19:18:36.768779000 +0000 >-+++ pdf-unicode.hh 2019-10-27 19:19:00.052652000 +0000 >-@@ -58,7 +58,7 @@ >- Unicode* data; >- int length_; >- public: >-- explicit FullNFKC(Unicode *, int length); >-+ explicit FullNFKC(const Unicode *, int length); >- ~FullNFKC(); >- int length() const >- { >-@@ -79,7 +79,7 @@ >- protected: >- std::basic_string<Unicode> string; >- public: >-- explicit MinimalNFKC(Unicode *, int length); >-+ explicit MinimalNFKC(const Unicode *, int length); >- int length() const; >- operator const Unicode*() const; >- }; >diff --git a/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 b/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 >index 849e994dd895..2b60fc8ab0cc 100644 >--- a/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 >+++ b/editors/libreoffice/files/patch-git_9065cd8d-poppler-0.83 >@@ -7,17 +7,9 @@ Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 > Reviewed-on: https://gerrit.libreoffice.org/84384 > Tested-by: Jenkins > Reviewed-by: Michael Stahl <michael.stahl@cib.de> >---- >- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ >- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ >- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ >- 3 files changed, 15 insertions(+) >- >-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx >-index 26048177e87d..e9c2a407c279 100644 >---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx >+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2019-12-05 19:59:23 UTC > +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx >-@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const >+@@ -491,11 +491,18 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) cons > gfree(pBuf); > } > >@@ -36,9 +28,23 @@ index 26048177e87d..e9c2a407c279 100644 > GfxSubpath* pSub = pPath->getSubpath( i ); > const int nPoints = pSub->getNumPoints(); > >-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx >-index 02f6b59f6f15..2e7d2186f9a1 100644 >---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx >+@@ -556,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) >+ if (!(pAction && pAction->getKind() == actionURI)) >+ return; >+ >+-#if POPPLER_CHECK_VERSION(0, 72, 0) >++#if POPPLER_CHECK_VERSION(0, 86, 0) >++ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str(); >++#elif POPPLER_CHECK_VERSION(0, 72, 0) >+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); >+ #else >+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); >+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 +++++++ >+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ >+ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++ >+ 3 files changed, 15 insertions(+) >+ >+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2019-12-05 19:59:23 UTC > +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx > @@ -149,7 +149,11 @@ namespace pdfi > >@@ -52,9 +58,7 @@ index 02f6b59f6f15..2e7d2186f9a1 100644 > > public: > explicit PDFOutDev( PDFDoc* pDoc ); >-diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx >-index 42178b650cdd..b1a54bd09c5f 100644 >---- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx >+--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig 2019-12-05 19:59:23 UTC > +++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx > @@ -68,7 +68,11 @@ int main(int argc, char **argv) > } >diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile >index 3a56ebb6e1c3..684b30714050 100644 >--- a/graphics/poppler/Makefile >+++ b/graphics/poppler/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= poppler >-DISTVERSION= 0.85.0 >+DISTVERSION= 0.86.1 > CATEGORIES= graphics print > MASTER_SITES= https://poppler.freedesktop.org/ > >@@ -47,6 +47,7 @@ CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} > PORTSCOUT= limitw:1,even > USES+= iconv > CMAKE_ON+= ENABLE_CPP >+PLIST_SUB+= SHLIB_VER=97 > > OPTIONS_DEFINE= CURL OPENJPEG > OPTIONS_DEFAULT= OPENJPEG >diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo >index 28376710f661..4a33dbc6ec3a 100644 >--- a/graphics/poppler/distinfo >+++ b/graphics/poppler/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1580408023 >-SHA256 (poppler-0.85.0.tar.xz) = 2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b >-SIZE (poppler-0.85.0.tar.xz) = 1588616 >+TIMESTAMP = 1584260973 >+SHA256 (poppler-0.86.1.tar.xz) = af630a277c8e194c31339c5446241834aed6ed3d4b4dc7080311e51c66257f6c >+SIZE (poppler-0.86.1.tar.xz) = 1593856 >diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist >index e05c5ef9cbc2..ad3dc18df9cf 100644 >--- a/graphics/poppler/pkg-plist >+++ b/graphics/poppler/pkg-plist >@@ -132,8 +132,8 @@ lib/libpoppler-cpp.so > lib/libpoppler-cpp.so.0 > lib/libpoppler-cpp.so.0.7.0 > lib/libpoppler.so >-lib/libpoppler.so.95 >-lib/libpoppler.so.95.0.0 >+lib/libpoppler.so.%%SHLIB_VER%% >+lib/libpoppler.so.%%SHLIB_VER%%.0.0 > libdata/pkgconfig/poppler-cairo.pc > libdata/pkgconfig/poppler-cpp.pc > libdata/pkgconfig/poppler-splash.pc >diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp >index f9309530fe67..032a42a5c3f1 100644 >--- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp >+++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp >@@ -1,4 +1,4 @@ >---- scribus/plugins/import/pdf/importpdf.cpp.orig 2020-01-18 17:59:00 UTC >+--- scribus/plugins/import/pdf/importpdf.cpp.orig 2020-03-15 14:15:45 UTC > +++ scribus/plugins/import/pdf/importpdf.cpp > @@ -75,7 +75,7 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) > QImage PdfPlug::readThumbnail(const QString& fName) >@@ -54,6 +54,22 @@ > return false; > } > pageString = optImp->getPagesString(); >+@@ -839,13 +834,13 @@ bool PdfPlug::convert(const QString& fn) >+ if (names.isDict()) >+ { >+ LinkAction *linkAction = nullptr; >+- linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); >++ linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()).get(); >+ if (linkAction) >+ { >+ LinkJavaScript *jsa = (LinkJavaScript*)linkAction; >+ if (jsa->isOk()) >+ { >+- QString script = UnicodeParsedString(jsa->getScript()); >++ QString script = QString::fromStdString(jsa->getScript()); >+ if (script.startsWith("this.")) >+ { >+ script.remove(0, 5); > @@ -908,7 +903,7 @@ bool PdfPlug::convert(const QString& fn) > } > delete pdfDoc; >diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp >index d73ea82f4885..2ecb817de967 100644 >--- a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp >+++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp >@@ -1,5 +1,167 @@ >---- scribus/plugins/import/pdf/slaoutput.cpp.orig 2020-01-18 17:22:17 UTC >+--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2020-03-15 14:15:45 UTC > +++ scribus/plugins/import/pdf/slaoutput.cpp >+@@ -324,7 +324,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const >+ { >+ Object actionObject = additionalActionsObject.dictLookup(key); >+ if (actionObject.isDict()) >+- linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()); >++ linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()).get(); >+ } >+ } >+ return linkAction; >+@@ -455,7 +455,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub >+ POPPLER_CONST GooString *ndst = gto->getNamedDest(); >+ if (ndst) >+ { >+- LinkDest *dstn = pdfDoc->findDest(ndst); >++ LinkDest *dstn = pdfDoc->findDest(ndst).get(); >+ if (dstn) >+ { >+ if (dstn->getKind() == destXYZ) >+@@ -499,7 +499,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub >+ POPPLER_CONST GooString *ndst = gto->getNamedDest(); >+ if (ndst) >+ { >+- LinkDest *dstn = pdfDoc->findDest(ndst); >++ LinkDest *dstn = pdfDoc->findDest(ndst).get(); >+ if (dstn) >+ { >+ if (dstn->getKind() == destXYZ) >+@@ -517,7 +517,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub >+ { >+ LinkURI *gto = (LinkURI*)act; >+ validLink = true; >+- fileName = UnicodeParsedString(gto->getURI()); >++ fileName = QString::fromStdString(gto->getURI()); >+ } >+ if (validLink) >+ { >+@@ -930,7 +930,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ if (jsa->isOk()) >+ { >+ ite->annotation().setActionType(1); >+- ite->annotation().setAction(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setAction(QString::fromStdString(jsa->getScript())); >+ } >+ } >+ else if (Lact->getKind() == actionGoTo) >+@@ -967,7 +967,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ POPPLER_CONST GooString *ndst = gto->getNamedDest(); >+ if (ndst) >+ { >+- LinkDest *dstn = pdfDoc->findDest(ndst); >++ LinkDest *dstn = pdfDoc->findDest(ndst).get(); >+ if (dstn) >+ { >+ if (dstn->getKind() == destXYZ) >+@@ -1019,7 +1019,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ POPPLER_CONST GooString *ndst = gto->getNamedDest(); >+ if (ndst) >+ { >+- LinkDest *dstn = pdfDoc->findDest(ndst); >++ LinkDest *dstn = pdfDoc->findDest(ndst).get(); >+ if (dstn) >+ { >+ if (dstn->getKind() == destXYZ) >+@@ -1039,7 +1039,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ else if (Lact->getKind() == actionUnknown) >+ { >+ LinkUnknown *uno = (LinkUnknown*)Lact; >+- QString actString = UnicodeParsedString(uno->getAction()); >++ QString actString = QString::fromStdString(uno->getAction()); >+ if (actString == "ResetForm") >+ { >+ ite->annotation().setActionType(4); >+@@ -1083,7 +1083,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ { >+ LinkNamed *uno = (LinkNamed*)Lact; >+ ite->annotation().setActionType(10); >+- ite->annotation().setAction(UnicodeParsedString(uno->getName())); >++ ite->annotation().setAction(QString::fromStdString(uno->getName())); >+ } >+ else >+ qDebug() << "Found unsupported Action of type" << Lact->getKind(); >+@@ -1096,7 +1096,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setD_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setD_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1110,7 +1110,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setE_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setE_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1124,7 +1124,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setX_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setX_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1138,7 +1138,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setFo_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1152,7 +1152,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setBl_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1166,7 +1166,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setC_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setC_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } >+@@ -1180,7 +1180,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setF_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setF_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ ite->annotation().setFormat(5); >+ } >+@@ -1195,7 +1195,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setK_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setK_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ ite->annotation().setFormat(5); >+ } >+@@ -1210,7 +1210,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW >+ LinkJavaScript *jsa = (LinkJavaScript*)Aact; >+ if (jsa->isOk()) >+ { >+- ite->annotation().setV_act(UnicodeParsedString(jsa->getScript())); >++ ite->annotation().setV_act(QString::fromStdString(jsa->getScript())); >+ ite->annotation().setAAact(true); >+ } >+ } > @@ -1224,16 +1224,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, > catalog = catA; > pdfDoc = doc;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=212430">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 244827
: 212430