Re: blanket license statement ...

[Ionut Biru]

All of my past  future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license

-- 
Ionut
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] poppler 0.20 changed its api

[Ionut Biru]

Modification introduced in
http://cgit.freedesktop.org/poppler/poppler/commit/?id=c0affb1845c339f89ca67608cb9fd9134ff902f5

Signed-off-by: Ionut Biru ib...@archlinux.org
---
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 
 1 file changed, 4 insertions(+)

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();
-- 
1.7.10.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [SOLVED] build error with poppler 0.20.0

[Ionut Biru]

On 05/14/2012 08:19 PM, Gökçen Eraslan wrote:
 On 14-05-2012 16:07, Petr Mladek wrote:
 Gökçen Eraslan píše v Ne 13. 05. 2012 v 21:51 +0300:
 On 13-05-2012 21:09, Andreas Radke wrote:
 ArchLinux is moving to poppler 0.20.0 that breaks LibO build:

 [ build CXX ] svl/source/misc/sharecontrolfile
 /build/src/libreoffice-core-3.5.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:
  In member function 'int pdfi::PDFOutDev::parseFont(long long int, 
 GfxFont*, GfxState*) const':
 /build/src/libreoffice-core-3.5.3.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:406:28:
 error: 'class GfxFont' has no member named 'getOrigName'

 Can you try changing getOrigName to getName? It seems function name is
 changed to getName[1].

 Ionut provided nice patch, see
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=704f3155cca2e1fb5ad071539b7f8b5e5522dd97
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=ac68934592ec7d838cf5c22744be8d97aa4a1a47


 
 GooString* pFamily = gfxFont-getName();
 if( ! pFamily )
 #if POPPLER_CHECK_VERSION(0, 20, 0)
 pFamily = gfxFont-getName();
 #else
 pFamily = gfxFont-getOrigName();
 #endif
 
 Is it all right to call getName() second time if pFamily is null and
 poppler is 0.20?
 

i believe that was already been addressed.

 Best Regards,
 Petr


 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 
 


-- 
Ionuț



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice