diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx index a9812be..20d5bd5 100644 --- a/filter/pdftoijs.cxx +++ b/filter/pdftoijs.cxx @@ -70,7 +70,10 @@ namespace { } #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 -#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 +#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70 +void CDECL myErrorFun(void *data, ErrorCategory category, + Goffset pos, const char *msg) +#elif POPPLER_VERSION_MINOR >= 23 void CDECL myErrorFun(void *data, ErrorCategory category, Goffset pos, char *msg) #else diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx index aabac8d..f02f211 100644 --- a/filter/pdftoraster.cxx +++ b/filter/pdftoraster.cxx @@ -281,7 +281,10 @@ cmsHPROFILE sgray_profile() } #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19 -#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23 +#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 70 +void CDECL myErrorFun(void *data, ErrorCategory category, + Goffset pos, const char *msg) +#elif POPPLER_VERSION_MINOR >= 23 void CDECL myErrorFun(void *data, ErrorCategory category, Goffset pos, char *msg) #else @@ -1686,7 +1689,7 @@ static void outPage(PDFDoc *doc, Catalog *catalog, int pageNo, { SplashBitmap *bitmap; Page *page = catalog->getPage(pageNo); - PDFRectangle *mediaBox = page->getMediaBox(); + const PDFRectangle *mediaBox = page->getMediaBox(); int rotate = page->getRotate(); double paperdimensions[2], /* Physical size of the paper */ margins[4]; /* Physical margins of print */