fix rebase errors
This commit is contained in:
parent
3fbd242ba6
commit
d75b73a309
|
@ -32,16 +32,6 @@ jobs:
|
||||||
- run: make -j4
|
- run: make -j4
|
||||||
- run: make check || .ci/fail.sh
|
- run: make check || .ci/fail.sh
|
||||||
|
|
||||||
macos-notest-ios:
|
|
||||||
macos:
|
|
||||||
xcode: "10.2.0"
|
|
||||||
steps:
|
|
||||||
- checkout
|
|
||||||
- run: HOMEBREW_NO_AUTO_UPDATE=1 brew install wget autoconf automake libtool pkg-config ragel freetype glib cairo icu4c graphite2
|
|
||||||
- run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2
|
|
||||||
- run: make -j4
|
|
||||||
- run: make check || .ci/fail.sh
|
|
||||||
|
|
||||||
distcheck:
|
distcheck:
|
||||||
docker:
|
docker:
|
||||||
- image: ubuntu:17.10
|
- image: ubuntu:17.10
|
||||||
|
@ -312,7 +302,6 @@ workflows:
|
||||||
- macos-10.12.6-aat-fonts
|
- macos-10.12.6-aat-fonts
|
||||||
- macos-10.13.6-aat-fonts
|
- macos-10.13.6-aat-fonts
|
||||||
- macos-10.14.3-aat-fonts
|
- macos-10.14.3-aat-fonts
|
||||||
- macos-notest-ios
|
|
||||||
|
|
||||||
# both autotools and cmake
|
# both autotools and cmake
|
||||||
- distcheck
|
- distcheck
|
||||||
|
|
|
@ -358,7 +358,7 @@ typedef enum
|
||||||
/*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'),
|
/*11.0*/HB_SCRIPT_SOGDIAN = HB_TAG ('S','o','g','d'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Since REPLACEME
|
* Since 2.4.0
|
||||||
*/
|
*/
|
||||||
/*12.0*/HB_SCRIPT_ELYMAIC = HB_TAG ('E','l','y','m'),
|
/*12.0*/HB_SCRIPT_ELYMAIC = HB_TAG ('E','l','y','m'),
|
||||||
/*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'),
|
/*12.0*/HB_SCRIPT_NANDINAGARI = HB_TAG ('N','a','n','d'),
|
||||||
|
|
|
@ -931,7 +931,8 @@ _hb_directwrite_font_release (void *data)
|
||||||
/**
|
/**
|
||||||
* hb_directwrite_face_create:
|
* hb_directwrite_face_create:
|
||||||
* @font_face:
|
* @font_face:
|
||||||
* Since: REPLACEME
|
*
|
||||||
|
* Since: 2.4.0
|
||||||
**/
|
**/
|
||||||
hb_face_t *
|
hb_face_t *
|
||||||
hb_directwrite_face_create (IDWriteFontFace *font_face)
|
hb_directwrite_face_create (IDWriteFontFace *font_face)
|
||||||
|
@ -941,3 +942,15 @@ hb_directwrite_face_create (IDWriteFontFace *font_face)
|
||||||
return hb_face_create_for_tables (reference_table, font_face,
|
return hb_face_create_for_tables (reference_table, font_face,
|
||||||
_hb_directwrite_font_release);
|
_hb_directwrite_font_release);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hb_directwrite_face_get_font_face:
|
||||||
|
* @face:
|
||||||
|
*
|
||||||
|
* Since: REPLACEME
|
||||||
|
**/
|
||||||
|
IDWriteFontFace *
|
||||||
|
hb_directwrite_face_get_font_face (hb_face_t *face)
|
||||||
|
{
|
||||||
|
return face->data.directwrite->fontFace;
|
||||||
|
}
|
||||||
|
|
|
@ -37,6 +37,9 @@ hb_directwrite_shape_experimental_width (hb_font_t *font, hb_buffer_t *buffer,
|
||||||
HB_EXTERN hb_face_t *
|
HB_EXTERN hb_face_t *
|
||||||
hb_directwrite_face_create (IDWriteFontFace *font_face);
|
hb_directwrite_face_create (IDWriteFontFace *font_face);
|
||||||
|
|
||||||
|
HB_EXTERN IDWriteFontFace *
|
||||||
|
hb_directwrite_face_get_font_face (hb_face_t *face);
|
||||||
|
|
||||||
HB_END_DECLS
|
HB_END_DECLS
|
||||||
|
|
||||||
#endif /* HB_DIRECTWRITE_H */
|
#endif /* HB_DIRECTWRITE_H */
|
||||||
|
|
|
@ -95,7 +95,7 @@ struct Null {
|
||||||
template <typename QType>
|
template <typename QType>
|
||||||
struct NullHelper
|
struct NullHelper
|
||||||
{
|
{
|
||||||
typedef typename hb_remove_const (typename hb_remove_reference (QType)) Type;
|
typedef hb_remove_const (hb_remove_reference (QType)) Type;
|
||||||
static const Type & get_null () { return Null<Type>::get_null (); }
|
static const Type & get_null () { return Null<Type>::get_null (); }
|
||||||
};
|
};
|
||||||
#define Null(Type) NullHelper<Type>::get_null ()
|
#define Null(Type) NullHelper<Type>::get_null ()
|
||||||
|
|
Loading…
Reference in New Issue