[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] harfbuzz 2ae0c7a 1/2: Revert previous commit
From: |
YAMAMOTO Mitsuharu |
Subject: |
[Emacs-diffs] harfbuzz 2ae0c7a 1/2: Revert previous commit |
Date: |
Sun, 2 Jun 2019 00:34:38 -0400 (EDT) |
branch: harfbuzz
commit 2ae0c7a434dcdcc53e2ccfc758093714b0695c3b
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>
Revert previous commit
This reverts commit 1ab69630dcb8c7a1b1b4171211a7c8ebf11b0d1c.
It has a wrong commit message.
---
configure.ac | 7 -------
src/ftcrfont.c | 6 +++---
src/ftfont.c | 30 +++++-------------------------
src/ftxfont.c | 2 +-
src/xftfont.c | 2 +-
5 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/configure.ac b/configure.ac
index bd51f54..b228571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3413,13 +3413,6 @@ if test "${HAVE_X11}" = "yes"; then
if test "${HAVE_FREETYPE}" = "yes"; then
AC_DEFINE(HAVE_FREETYPE, 1,
[Define to 1 if using the freetype and fontconfig libraries.])
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
- LIBS="$FREETYPE_LIBS $LIBS"
- AC_CHECK_FUNCS(FT_Face_GetCharVariantIndex)
- CFLAGS=$OLD_CFLAGS
- LIBS=$OLD_LIBS
if test "${with_libotf}" != "no"; then
EMACS_CHECK_MODULES([LIBOTF], [libotf])
if test "$HAVE_LIBOTF" = "yes"; then
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 1c28a7ce..0c3b74f 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -455,7 +455,7 @@ ftcrfont_shape (Lisp_Object lgstring, Lisp_Object direction)
}
#endif
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
static int
ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
{
@@ -470,7 +470,7 @@ ftcrfont_variation_glyphs (struct font *font, int c,
unsigned variations[256])
return result;
}
-#endif /* HAVE_OTF_GET_VARIATION_GLYPHS || HAVE_FT_FACE_GETCHARVARIANTINDEX */
+#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
static int
ftcrfont_draw (struct glyph_string *s,
@@ -583,7 +583,7 @@ struct font_driver const ftcrfont_driver =
#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
.shape = ftcrfont_shape,
#endif
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
.get_variation_glyphs = ftcrfont_variation_glyphs,
#endif
.filter_properties = ftfont_filter_properties,
diff --git a/src/ftfont.c b/src/ftfont.c
index efd0fcb..97ab4d0 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2820,41 +2820,21 @@ ftfont_shape (Lisp_Object lgstring, Lisp_Object
direction)
#endif /* HAVE_M17N_FLT */
-#endif /* HAVE_LIBOTF */
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
int
ftfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
{
struct font_info *ftfont_info = (struct font_info *) font;
-#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
OTF *otf = ftfont_get_otf (ftfont_info);
if (! otf)
return 0;
return OTF_get_variation_glyphs (otf, c, variations);
-#else /* !HAVE_OTF_GET_VARIATION_GLYPHS */
- FT_Face ft_face = ftfont_info->ft_size->face;
- int i, n = 0;
-
- for (i = 0; i < 16; i++)
- {
- variations[i] = FT_Face_GetCharVariantIndex (ft_face, c, 0xFE00 + i);
- if (variations[i])
- n++;
- }
- for (; i < 256; i++)
- {
- variations[i] = FT_Face_GetCharVariantIndex (ft_face, c,
- 0xE0100 + (i - 16));
- if (variations[i])
- n++;
- }
-
- return n;
-#endif /* !HAVE_OTF_GET_VARIATION_GLYPHS */
}
-#endif /* HAVE_OTF_GET_VARIATION_GLYPHS || HAVE_FT_FACE_GETCHARVARIANTINDEX */
+
+#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
+#endif /* HAVE_LIBOTF */
#ifdef HAVE_HARFBUZZ
@@ -2956,7 +2936,7 @@ static struct font_driver const ftfont_driver =
#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
.shape = ftfont_shape,
#endif
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
.get_variation_glyphs = ftfont_variation_glyphs,
#endif
.filter_properties = ftfont_filter_properties,
diff --git a/src/ftxfont.c b/src/ftxfont.c
index b146736..da3e3fb 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -351,7 +351,7 @@ struct font_driver const ftxfont_driver =
#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
.shape = ftfont_shape,
#endif
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
.get_variation_glyphs = ftfont_variation_glyphs,
#endif
.filter_properties = ftfont_filter_properties,
diff --git a/src/xftfont.c b/src/xftfont.c
index 04cda12..c1b93b7 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -661,7 +661,7 @@ struct font_driver const xftfont_driver =
#if defined HAVE_M17N_FLT && defined HAVE_LIBOTF
.shape = xftfont_shape,
#endif
-#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined
HAVE_FT_FACE_GETCHARVARIANTINDEX
+#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
.get_variation_glyphs = ftfont_variation_glyphs,
#endif
.filter_properties = ftfont_filter_properties,