Re: [Libreoffice-commits] .: sdext/source

On Mon, May 14, 2012 at 01:06:56AM -0700, Fridrich Strba wrote:
>  sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |    4 ++++
>  1 file changed, 4 insertions(+)
>
> New commits:
> commit 704f3155cca2e1fb5ad071539b7f8b5e5522dd97
> Author: Ionut Biru <ibiru@archlinux.org>
> Date:   Sun May 13 23:57:46 2012 +0000
>
>     poppler 0.20 changed its api
>     
>     Modification introduced in
>     
> http://cgit.freedesktop.org/poppler/poppler/commit/?id=c0affb1845c339f89ca67608cb9fd9134ff902f5
>     
>     Signed-off-by: Ionut Biru <ibiru@archlinux.org>
>
> diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
> b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> index 77e5896..c9ffed3 100644
> --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
> @@ -407,7 +407,11 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* 
> state )
>  
>      GooString* pFamily = gfxFont->getName();
>      if( ! pFamily )
> +#if POPPLER_CHECK_VERSION(0, 20, 0)
> +        pFamily = gfxFont->getName();
> +#else
>          pFamily = gfxFont->getOrigName();
> +#endif
>      if( pFamily )
>      {
>          aNewFont.familyName.clear();

Is it not a bit pointless to call the same function again, if the first
call did not produce any result?

D.