Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:11.4:Update
libreoffice-help-group3.385
libreoffice-poppler-0.17.0-reject-fix.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File libreoffice-poppler-0.17.0-reject-fix.diff of Package libreoffice-help-group3.385
--- configure.in +++ configure.in @@ -6598,16 +6598,6 @@ AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - save_CPPFLAGS=$CPPFLAGS - CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS" - CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" - AC_CHECK_HEADER([cpp/poppler-version.h], [], - [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], []) - CXXFLAGS=$save_CXXFLAGS - CPPFLAGS=$save_CPPFLAGS - AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) SYSTEM_POPPLER=NO --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx @@ -150,11 +150,7 @@ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) { // dump JPEG file as-is -#if POPPLER_CHECK_VERSION(0, 17, 3) - str = str->getBaseStream(); -#else str = ((DCTStream *)str)->getRawStream(); -#endif str->reset(); int c; @@ -493,11 +489,7 @@ printf("endPage\n"); } -#if POPPLER_CHECK_VERSION(0, 17, 0) -void PDFOutDev::processLink(AnnotLink *link, Catalog *) -#else void PDFOutDev::processLink(Link* link, Catalog*) -#endif { assert(link); --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx @@ -65,14 +65,7 @@ class GfxFont; class PDFDoc; #ifndef SYSTEM_POPPLER -#define POPPLER_CHECK_VERSION(major,minor,micro) (0) typedef GString GooString; -#else -#include <cpp/poppler-version.h> -#define POPPLER_CHECK_VERSION(major,minor,micro) \ - (POPPLER_VERSION_MAJOR > (major) || \ - (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \ - (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro))) #endif namespace pdfi @@ -201,12 +194,8 @@ // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); - #if POPPLER_CHECK_VERSION(0, 17, 0) - virtual void processLink(AnnotLink *link, Catalog *catalog); - #else //----- link borders virtual void processLink(Link *link, Catalog *catalog); - #endif //----- save/restore graphics state virtual void saveState(GfxState *state);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor