From cf7f6ba13f2824ca21baee59f6f25f0ee671cd54 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 14 May 2012 15:35:05 +0200 Subject: better fix for poppler 0.20 Do not call gfxFont->getName() twice; Thanks David Tardon for catching this. Heh, I wonder if gfxFont->getOrigName() ever given any different value than getName() ;-) Change-Id: Idaf95a6a024076c6d450519923b6129166a5f8bd --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx index c9ffed3e40de..46ac1c65e0f6 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -406,10 +406,8 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) int nSize = 0; GooString* pFamily = gfxFont->getName(); +#if !POPPLER_CHECK_VERSION(0, 20, 0) if( ! pFamily ) -#if POPPLER_CHECK_VERSION(0, 20, 0) - pFamily = gfxFont->getName(); -#else pFamily = gfxFont->getOrigName(); #endif if( pFamily ) -- cgit v1.2.3