.gitlab-ci.yml | 1 +
poppler/GfxState.cc | 2 ++
poppler/GlobalParams.cc | 4 ++++
3 files changed, 7 insertions(+)
New commits:
commit 67190c0a05045d3c3eef4d5f0eaeb4435eb59c7c
Author: Albert Astals Cid <aa...@kde.org>
Date: Wed Apr 20 19:58:56 2022 +0200
CI: -Werror for the Android builder
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2722d68..52d064b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,6 +113,7 @@ build_android:
-DENABLE_DCTDECODER=unmaintained
-DENABLE_LIBOPENJPEG=unmaintained
-DENABLE_BOOST=OFF
+ -DCMAKE_CXX_FLAGS="-Werror
-Wno-deprecated-declarations"
-DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
- ninja
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index e2065a06..1c5e5c8b 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -664,6 +664,7 @@ static const double white_d65_X = 0.9505;
static const double white_d65_Y = 1.0;
static const double white_d65_Z = 1.0890;
+#ifdef USE_CMS
// D50 is the default white point as used in ICC profiles and in the lcms2
library
static const double white_d50_X = 0.96422;
static const double white_d50_Y = 1.0;
@@ -691,6 +692,7 @@ static void inline bradford_transform_to_d50(double &X,
double &Y, double &Z, co
Y = 0.43069901 * rho_in + 0.52894900 * gamma_in + 0.04035199 * beta_in;
Z = 0.00849698 * rho_in + 0.04086079 * gamma_in + 0.79284618 * beta_in;
}
+#endif
static void inline bradford_transform_to_d65(double &X, double &Y, double &Z,
const double source_whiteX, const double source_whiteY, const double
source_whiteZ)
{
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 570b592b..28a1e146 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -893,6 +893,8 @@ GooString *GlobalParams::findFontFile(const std::string
&fontName)
return path;
}
+#if defined(WITH_FONTCONFIGURATION_FONTCONFIG) ||
defined(WITH_FONTCONFIGURATION_WIN32)
+
static bool supportedFontForEmbedding(Unicode uChar, const char *filepath, int
faceIndex)
{
if (!GooString::endsWith(filepath, ".ttf") &&
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath,
".otf")) {
@@ -926,6 +928,8 @@ static bool supportedFontForEmbedding(Unicode uChar, const
char *filepath, int f
return glyph > 0;
}
+#endif
+
/* if you can't or don't want to use Fontconfig, you need to implement
this function for your platform. For Windows, it's in GlobalParamsWin.cc
*/
