summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2017-07-25 13:24:50 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2017-07-25 13:24:50 +0000
commit4670a2817c984493424e7fea3d73d614dbdb5089 (patch)
treee57f0350013c9c581873379448b73e80c5c152e4 /src/libnrtype
parentlibcola: C++11 fixes for Trusty (diff)
downloadinkscape-4670a2817c984493424e7fea3d73d614dbdb5089.tar.gz
inkscape-4670a2817c984493424e7fea3d73d614dbdb5089.zip
Fix Harfbuzz version check for Trusty
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index fe0da45dc..5c6a96694 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -747,7 +747,10 @@ font_instance *font_factory::Face(PangoFontDescription *descr, bool canFail)
}
}
-#if HB_VERSION_ATLEAST(1,2,3)
+// TODO: Ideally, we should use the HB_VERSION_ATLEAST macro here,
+// but this was only released in harfbuzz >= 0.9.30
+// #if HB_VERSION_ATLEAST(1,2,3)
+#if HB_VERSION_MAJOR*10000 + HB_VERSION_MINOR*100 + HB_VERSION_MICRO >= 10203
// Find glyphs in OpenType substitution tables ('gsub').
// Note that pango's functions are just dummies. Must use harfbuzz.