walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[coretext] Use fabsf() instead of abs() 

Fixes bots.

Link libharfbuzz.so with -lm.  Surprising that we survived without
it so far!
This commit is contained in:
Behdad Esfahbod 2017-10-12 10:46:09 +02:00
parent dfeccd073a
commit 6a2cbc6ef5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -122,7 +122,7 @@ endif
libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS)
libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)
libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -lm -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined
libharfbuzz_la_LIBADD = $(HBLIBS) libharfbuzz_la_LIBADD = $(HBLIBS)
EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency)
pkginclude_HEADERS = $(HBHEADERS) pkginclude_HEADERS = $(HBHEADERS)

2
src/harfbuzz.pc.in
View File

@ -8,6 +8,6 @@ Description: HarfBuzz text shaping library
Version: %VERSION% Version: %VERSION%
Libs: -L${libdir} -lharfbuzz Libs: -L${libdir} -lharfbuzz
Libs.private: %libs_private% Libs.private: -lm %libs_private%
Requires.private: %requires_private% Requires.private: %requires_private%
Cflags: -I${includedir}/harfbuzz Cflags: -I${includedir}/harfbuzz

5
src/hb-coretext.cc
View File

@ -30,6 +30,7 @@
#include "hb-shaper-impl-private.hh" #include "hb-shaper-impl-private.hh"
#include "hb-coretext.h" #include "hb-coretext.h"
#include <math.h>
#ifndef HB_DEBUG_CORETEXT #ifndef HB_DEBUG_CORETEXT
@ -79,8 +80,8 @@ hb_coretext_face_create (CGFontRef cg_font)
HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face) HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face)
HB_SHAPER_DATA_ENSURE_DEFINE_WITH_CONDITION(coretext, font, HB_SHAPER_DATA_ENSURE_DEFINE_WITH_CONDITION(coretext, font,
abs (CTFontGetSize((CTFontRef) data) - fabsf (CTFontGetSize((CTFontRef) data) -
(font->ptem <= 0 ? HB_CORETEXT_DEFAULT_FONT_SIZE : font->ptem)) < 1) (font->ptem <= 0 ? HB_CORETEXT_DEFAULT_FONT_SIZE : font->ptem)) <= .5)
/* /*
* shaper face data * shaper face data