diff options
author | Nathan Pratta Teodosio <nathan.teodosio@canonical.com> | 2022-06-21 08:47:14 -0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-06-27 13:27:01 +0200 |
commit | 19957cc2d7fac8edd9550f7815694daed8498b38 (patch) | |
tree | d512e6c8da45d3fb9372e9a431f6dc58f6abe671 | |
parent | 05f8da6afc3c83eefd06f91cd7a2bc91a84ef8ea (diff) |
Follow-up for Poppler 22.06 update
Change-Id: I8ee9f1a53cc4389e6a4d44e9765b478b5edfffd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136342
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit ad1ffc62e40c2409b610dfff25a8483b1f2556ad)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136382
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index d9efa39d8a54..f12478cb2f4d 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -476,10 +476,10 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, const GfxState* st // 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() ); - nSize = pBuf->size(); - if ( nSize > 0 ) + if ( pBuf ) { aNewFont.isEmbedded = true; + nSize = pBuf->size(); } #else char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); @@ -503,7 +503,8 @@ 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() ); - nSize = pBuf->size(); + if ( pBuf ) + nSize = pBuf->size(); if ( nSize == 0 ) return; #else |