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

Merge branch 'master' into cff-more-arrayof-fixes

This commit is contained in:
Michiharu Ariza 2019-02-11 14:16:25 -08:00
parent 1239b6b2b4 fdfa3d29b7
commit c83412e4ce
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -52,7 +52,7 @@ jobs:
- image: alpine - image: alpine
steps: steps:
- checkout - checkout
- run: apk update && apk add ragel make pkgconfig libtool autoconf automake gettext gcc g++ glib-dev freetype-dev cairo-dev - run: apk update && apk add ragel make pkgconfig libtool autoconf automake gettext gcc g++ glib-dev freetype-dev cairo-dev python
# C??FLAGS are not needed for a regular build # C??FLAGS are not needed for a regular build
- run: CFLAGS="-O3" CXXFLAGS="-O3 -DHB_NO_MMAP" ./autogen.sh - run: CFLAGS="-O3" CXXFLAGS="-O3 -DHB_NO_MMAP" ./autogen.sh
- run: make -j32 - run: make -j32
@ -60,10 +60,10 @@ jobs:
archlinux-py3-all: archlinux-py3-all:
docker: docker:
- image: base/devel - image: archlinux/base
steps: steps:
- checkout - checkout
- run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip make which base-devel
- run: pip install flake8 fonttools - run: pip install flake8 fonttools
- run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
# C??FLAGS are not needed for a regular build # C??FLAGS are not needed for a regular build
@ -71,6 +71,15 @@ jobs:
- run: make -j32 CPPFLAGS="-Werror" - run: make -j32 CPPFLAGS="-Werror"
- run: make check CPPFLAGS="-Werror" || .ci/fail.sh - run: make check CPPFLAGS="-Werror" || .ci/fail.sh
## Doesn't play well with CircleCI apparently
#void-notest:
# docker:
# - image: voidlinux/voidlinux
# steps:
# - checkout
# - run: xbps-install -Suy freetype gettext gcc glib graphite pkg-config ragel libtool autoconf automake make
# - run: ./autogen.sh && make -j32 && make check
clang-O3-O0: clang-O3-O0:
docker: docker:
- image: multiarch/crossbuild - image: multiarch/crossbuild
@ -307,6 +316,7 @@ workflows:
# autotools based builds # autotools based builds
- alpine-O3-NOMMAP - alpine-O3-NOMMAP
- archlinux-py3-all - archlinux-py3-all
#- void-notest
- gcc-valgrind - gcc-valgrind
- clang-O3-O0 - clang-O3-O0
- clang-everything - clang-everything

10
src/hb-coretext.cc
View File

@ -171,7 +171,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) || if (CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSText")) ||
CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay"))) CFStringHasPrefix (cg_postscript_name, CFSTR (".SFNSDisplay")))
{ {
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1080
# define kCTFontUIFontSystem kCTFontSystemFontType # define kCTFontUIFontSystem kCTFontSystemFontType
# define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType # define kCTFontUIFontEmphasizedSystem kCTFontEmphasizedSystemFontType
#endif #endif
@ -214,7 +214,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
} }
CFURLRef original_url = nullptr; CFURLRef original_url = nullptr;
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
ATSFontRef atsFont; ATSFontRef atsFont;
FSRef fsref; FSRef fsref;
OSStatus status; OSStatus status;
@ -244,7 +244,7 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size)
* process in Blink. This can be detected by the new file URL location * process in Blink. This can be detected by the new file URL location
* that the newly found font points to. */ * that the newly found font points to. */
CFURLRef new_url = nullptr; CFURLRef new_url = nullptr;
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
atsFont = CTFontGetPlatformFont (new_ct_font, NULL); atsFont = CTFontGetPlatformFont (new_ct_font, NULL);
status = ATSFontGetFileReference (atsFont, &fsref); status = ATSFontGetFileReference (atsFont, &fsref);
if (status == noErr) if (status == noErr)
@ -711,7 +711,7 @@ resize_and_retry:
/* What's the iOS equivalent of this check? /* What's the iOS equivalent of this check?
* The symbols was introduced in iOS 7.0. * The symbols was introduced in iOS 7.0.
* At any rate, our fallback is safe and works fine. */ * At any rate, our fallback is safe and works fine. */
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1090
# define kCTLanguageAttributeName CFSTR ("NSLanguage") # define kCTLanguageAttributeName CFSTR ("NSLanguage")
#endif #endif
CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault, CFStringRef lang = CFStringCreateWithCStringNoCopy (kCFAllocatorDefault,
@ -783,7 +783,7 @@ resize_and_retry:
int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level); CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &level);
#if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060 #if !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel; extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
#endif #endif
CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault, CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault,