From d4fc82b90131470297aa67eed4aea2364933b607 Mon Sep 17 00:00:00 2001 From: Lu Wang Date: Mon, 16 Feb 2015 16:56:43 +0800 Subject: [PATCH] fix for poppler 0.31.0 --- src/BackgroundRenderer/SplashBackgroundRenderer.cc | 2 +- src/HTMLRenderer/font.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BackgroundRenderer/SplashBackgroundRenderer.cc b/src/BackgroundRenderer/SplashBackgroundRenderer.cc index 07900d7..b2d167e 100644 --- a/src/BackgroundRenderer/SplashBackgroundRenderer.cc +++ b/src/BackgroundRenderer/SplashBackgroundRenderer.cc @@ -29,7 +29,7 @@ using std::unique_ptr; const SplashColor SplashBackgroundRenderer::white = {255,255,255}; SplashBackgroundRenderer::SplashBackgroundRenderer(const string & imgFormat, HTMLRenderer * html_renderer, const Param & param) - : SplashOutputDev(splashModeRGB8, 4, gFalse, (SplashColorPtr)(&white), gTrue, gTrue) + : SplashOutputDev(splashModeRGB8, 4, gFalse, (SplashColorPtr)(&white), gTrue) , html_renderer(html_renderer) , param(param) , format(imgFormat) diff --git a/src/HTMLRenderer/font.cc b/src/HTMLRenderer/font.cc index 4a3e05e..2ca9fa3 100644 --- a/src/HTMLRenderer/font.cc +++ b/src/HTMLRenderer/font.cc @@ -882,7 +882,7 @@ const FontInfo * HTMLRenderer::install_font(GfxFont * font) * which does not make much sense in our case * If we specify gFalse here, font_loc->locaType cannot be gfxFontLocResident */ - if(auto * font_loc = font->locateFont(xref, gFalse)) + if(auto * font_loc = font->locateFont(xref, nullptr)) { switch(font_loc -> locType) { @@ -937,7 +937,7 @@ void HTMLRenderer::install_external_font(GfxFont * font, FontInfo & info) cerr << "Warning: workaround for font names in bad encodings." << endl; } - GfxFontLoc * localfontloc = font->locateFont(xref, gFalse); + GfxFontLoc * localfontloc = font->locateFont(xref, nullptr); if(param.embed_external_font) {