diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-05-14 15:35:05 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-05-14 15:38:31 +0200 |
| commit | cf7f6ba13f2824ca21baee59f6f25f0ee671cd54 (patch) | |
| tree | cc48a1fc302ca36e473c54c775982384767304ef /sdext | |
| parent | 6b3bf27cb56d661725ac3fcfb756562e0ad75564 (diff) | |
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
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 |
1 files changed, 1 insertions, 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 ) |