diff options
Diffstat (limited to 'editors/libreoffice/files/patch-archgit_poppler-0.70.patch')
-rw-r--r-- | editors/libreoffice/files/patch-archgit_poppler-0.70.patch | 179 |
1 files changed, 0 insertions, 179 deletions
diff --git a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch b/editors/libreoffice/files/patch-archgit_poppler-0.70.patch deleted file mode 100644 index 8ad0c409c5e9..000000000000 --- a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-30 16:55:21 UTC -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -528,7 +528,7 @@ void PDFOutDev::printPath( GfxPath* pPath ) - PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - m_pDoc( pDoc ), - m_aFontMap(), -- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), -+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), - m_bSkipImages(false) - { - } -@@ -569,7 +569,7 @@ void PDFOutDev::processLink(Link* link, Catalog*) - LinkAction* pAction = link->getAction(); - if (pAction && pAction->getKind() == actionURI) - { -- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); -+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); - - std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); - -@@ -592,7 +592,7 @@ void PDFOutDev::restoreState(GfxState*) - printf( "restoreState\n" ); - } - --void PDFOutDev::setDefaultCTM(double *pMat) -+void PDFOutDev::setDefaultCTM(const double *pMat) - { - assert(pMat); - -@@ -767,7 +767,7 @@ void PDFOutDev::updateFont(GfxState *state) - - aFont = it->second; - -- std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); -+ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); - printf( " %d %d %d %d %f %d %s", - aFont.isEmbedded, - aFont.isBold, -@@ -953,11 +953,11 @@ void PDFOutDev::endTextObject(GfxState*) - } - - void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, -- int width, int height, GBool invert, -+ int width, int height, bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif -- GBool /*inlineImg*/ ) -+ bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -986,9 +986,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif -- int* maskColors, GBool /*inlineImg*/ ) -+ int* maskColors, bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -1037,13 +1037,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, St - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert -+ bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , bool /*maskInterpolate*/ - #endif - ) - { -@@ -1059,13 +1059,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object* - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap* maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , bool /*maskInterpolate*/ - #endif - ) - { ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-10-30 16:55:21 UTC -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -150,22 +150,22 @@ namespace pdfi - - // Does this device use upside-down coordinates? - // (Upside-down means (0,0) is the top left corner of the page.) -- virtual GBool upsideDown() override { return gTrue; } -+ virtual bool upsideDown() override { return true; } - - // Does this device use drawChar() or drawString()? -- virtual GBool useDrawChar() override { return gTrue; } -+ virtual bool useDrawChar() override { return true; } - - // Does this device use beginType3Char/endType3Char? Otherwise, - // text in Type 3 fonts will be drawn with drawChar/drawString. -- virtual GBool interpretType3Chars() override { return gFalse; } -+ virtual bool interpretType3Chars() override { return false; } - - // Does this device need non-text content? -- virtual GBool needNonText() override { return gTrue; } -+ virtual bool needNonText() override { return true; } - - //----- initialization and control - - // Set default transform matrix. -- virtual void setDefaultCTM(double *ctm) override; -+ virtual void setDefaultCTM(const double *ctm) override; - - // Start a page. - virtual void startPage(int pageNum, GfxState *state -@@ -232,40 +232,40 @@ namespace pdfi - - //----- image drawing - virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, -- int width, int height, GBool invert, -+ int width, int height, bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif -- GBool inlineImg) override; -+ bool inlineImg) override; - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif -- int *maskColors, GBool inlineImg) override; -+ int *maskColors, bool inlineImg) override; - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif - Stream *maskStr, int maskWidth, int maskHeight, -- GBool maskInvert -+ bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , bool maskInterpolate - #endif - ) override; - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , bool maskInterpolate - #endif - ) override; - |