diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2022-09-19 09:31:04 +0200 |
---|---|---|
committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-09-19 16:09:12 +0200 |
commit | 9457530f9638d61ca8974bc337892ee094cc2277 (patch) | |
tree | 93a2336c5330b1edd3a97fa6e9fd0525299f6cc3 /sdext/source/pdfimport/xpdfwrapper | |
parent | c4936191992c061f602c57e225998a241ffa9834 (diff) |
Fix poppler 22.09.0 for winodwscib-6.1-37
VS2015 misses a few c++11 features, patch them out.
Change-Id: Iba1faaefb03275e944bf577ec3abe1b4275f9869
Diffstat (limited to 'sdext/source/pdfimport/xpdfwrapper')
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 | ||||
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index a763ea7e54d1..446f507daa80 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -462,7 +462,7 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) // TODO(P3): Unfortunately, need to read stream twice, since // we must write byte count to stdout before #if POPPLER_CHECK_VERSION(22, 6, 0) - std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); + boost::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); if ( pBuf ) { aNewFont.isEmbedded = true; @@ -489,7 +489,7 @@ void PDFOutDev::writeFontFile( GfxFont* gfxFont ) const int nSize = 0; #if POPPLER_CHECK_VERSION(22, 6, 0) - std::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); + boost::optional<std::vector<unsigned char>> pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef() ); if ( pBuf ) nSize = pBuf->size(); if ( nSize == 0 ) diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx index fd7ba9c332ea..7952adbcf206 100644 --- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx @@ -121,12 +121,12 @@ int main(int argc, char **argv) #if POPPLER_CHECK_VERSION(22, 6, 0) PDFDoc aDoc( std::make_unique<GooString>(pFileName), - std::optional<GooString>(pOwnerPasswordStr), - std::optional<GooString>(pUserPasswordStr) ); + boost::optional<GooString>(pOwnerPasswordStr), + boost::optional<GooString>(pUserPasswordStr) ); PDFDoc aErrDoc( std::make_unique<GooString>(pErrFileName), - std::optional<GooString>(pOwnerPasswordStr), - std::optional<GooString>(pUserPasswordStr) ); + boost::optional<GooString>(pOwnerPasswordStr), + boost::optional<GooString>(pUserPasswordStr) ); #else PDFDoc aDoc( pFileName, pOwnerPasswordStr, |