diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-05-14 15:35:05 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-05-14 16:33:54 +0200 |
| commit | 68ffcfada1da8db584f0e45c6756eac89bbbbca9 (patch) | |
| tree | eb2107d0b16efabea57e480a36b05af05bf4befd /sdext | |
| parent | 2742842e3bd77d7572e8b9cdc9d83fa8701c3b33 (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
(cherry picked from commit cf7f6ba13f2824ca21baee59f6f25f0ee671cd54)
Signed-off-by: David Tardon <dtardon@redhat.com>
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 7f0968b4338f..48e89dfad6b2 100644 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -402,10 +402,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 ) |