1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94
|
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 26 Nov 2018 11:36:51 +0100
Subject: Fix the build with poppler 0.71
---
bindings/poppler_cairo_img_renderer.cc | 4 ++--
bindings/poppler_splash_renderer.cc | 10 +++++-----
bindings/poppler_text.cc | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/bindings/poppler_cairo_img_renderer.cc b/bindings/poppler_cairo_img_renderer.cc
index d198600..1044eb4 100644
--- a/bindings/poppler_cairo_img_renderer.cc
+++ b/bindings/poppler_cairo_img_renderer.cc
@@ -139,9 +139,9 @@ int poppler_cairo_img_device_display_slice(void* output_dev, void* poppler_page,
(double)hDPI, (double)vDPI,
rotate,
#ifdef POPPLER_0_5
- gTrue, // use MediaBox
+ true, // use MediaBox
#endif
- gTrue, // Crop
+ true, // Crop
(int)sliceX, (int)sliceY,
(int)sliceW, (int)sliceH,
NULL, // Links
diff --git a/bindings/poppler_splash_renderer.cc b/bindings/poppler_splash_renderer.cc
index b51c32e..bb747b9 100644
--- a/bindings/poppler_splash_renderer.cc
+++ b/bindings/poppler_splash_renderer.cc
@@ -37,13 +37,13 @@ void* poppler_splash_device_create(int bg_red, int bg_green, int bg_blue)
SplashColor white;
#ifdef POPPLER_0_4
white.rgb8 = splashMakeRGB8(bg_red, bg_green, bg_blue);
- void* splashDevice = new SplashOutputDev(splashModeRGB8, gFalse, white);
+ void* splashDevice = new SplashOutputDev(splashModeRGB8, false, white);
#else // 0.5, 0.6
white[0] = bg_red;
white[1] = bg_green;
white[2] = bg_blue;
// I'm not sure what bitmapRowPad should be, 1 is just a guess.
- void* splashDevice = new SplashOutputDev(splashModeRGB8, 1, gFalse, white);
+ void* splashDevice = new SplashOutputDev(splashModeRGB8, 1, false, white);
#endif
END_SYNCHRONIZED;
@@ -92,13 +92,13 @@ int poppler_splash_device_display_slice(void* output_dev, void* poppler_page,
(double)hDPI, (double)vDPI,
rotate,
#ifndef POPPLER_0_4 // 0.5, 0.6
- gTrue, // useMediaBox
+ true, // useMediaBox
#endif
- gTrue, // Crop
+ true, // Crop
(int)sliceX, (int)sliceY,
(int)sliceW, (int)sliceH,
#ifdef POPPLER_0_6
- gFalse // printing
+ false // printing
#else
NULL // Links
#endif
diff --git a/bindings/poppler_text.cc b/bindings/poppler_text.cc
index 75e5b54..5ae64e9 100644
--- a/bindings/poppler_text.cc
+++ b/bindings/poppler_text.cc
@@ -56,11 +56,11 @@ int poppler_text_display_page(void* text_device, void* poppler_page, void* poppl
SYNCHRONIZED(PAGE(poppler_page)->display(TEXT_DEV(text_device),
hDPI, vDPI, rotate,
#ifndef POPPLER_0_4
- gTrue, // useMediaBox
+ true, // useMediaBox
#endif
crop,
#ifdef POPPLER_0_6
- gFalse // printing
+ false // printing
#else
NULL // links
#endif
@@ -84,10 +84,10 @@ int poppler_text_find(void* text_device, unsigned int* text_utf32, unsigned text
start_at_top, stop_at_bottom,
start_at_last, stop_at_last,
#ifndef POPPLER_0_4 // 0.5, 0.6
- gTrue, gFalse,
+ true, false,
#endif
#ifdef POPPLER_0_20
- gFalse,
+ false,
#endif
x_min, y_min, x_max, y_max);
END_SYNCHRONIZED;
|