sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert back to separate tests #if HB_VERSION_MAJOR > 0 #if HB_VERSION_ATLEAST(1, 0 , 5) ref #3642

Browse source
This commit is contained in:
artemp 2017-03-20 14:24:34 +00:00
parent edaca3a015
commit 5450255c5b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/text/harfbuzz_shaper.hpp
View file

@ -116,9 +116,10 @@ static void shape_text(text_line & line,
hb_buffer_set_script(buffer.get(), _icu_script_to_script(text_item.script)); hb_buffer_set_script(buffer.get(), _icu_script_to_script(text_item.script));
hb_font_t *font(hb_ft_font_create(face->get_face(), nullptr)); hb_font_t *font(hb_ft_font_create(face->get_face(), nullptr));
// https://github.com/mapnik/test-data-visual/pull/25 // https://github.com/mapnik/test-data-visual/pull/25
#if HB_VERSION_MAJOR > 0
#if (HB_VERSION_MAJOR > 0 && HB_VERSION_ATLEAST(1, 0, 5)) #if HB_VERSION_ATLEAST(1, 0 , 5)
hb_ft_font_set_load_flags(font,FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); hb_ft_font_set_load_flags(font,FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING);
#endif
#endif #endif
hb_shape(font, buffer.get(), ff_settings.get_features(), ff_count); hb_shape(font, buffer.get(), ff_settings.get_features(), ff_count);
hb_font_destroy(font); hb_font_destroy(font);