From cbc14b10e623a5d08c89a1323ae9c420c8492118 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 7 Jan 2021 10:13:15 +0100 Subject: [PATCH] Fix ABI incompatibility. * include/freetype/ftimage.h (FT_Pixel_Mode): Don't insert `FT_PIXEL_MODE_GRAY16' but append it. * src/base/ftobjs.c (pixel_modes): Updated. --- ChangeLog | 9 +++++++++ include/freetype/ftimage.h | 2 +- src/base/ftobjs.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8be2cd90..85f431de6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-01-07 Werner Lemberg + + Fix ABI incompatibility. + + * include/freetype/ftimage.h (FT_Pixel_Mode): Don't insert + `FT_PIXEL_MODE_GRAY16' but append it. + + * src/base/ftobjs.c (pixel_modes): Updated. + 2021-01-07 Alexei Podtelezhnikov [dlg] Move the headers to include/dlg to simplify their use. diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index 0aee7f07a..5b6d348f3 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -191,10 +191,10 @@ FT_BEGIN_HEADER FT_PIXEL_MODE_GRAY, FT_PIXEL_MODE_GRAY2, FT_PIXEL_MODE_GRAY4, - FT_PIXEL_MODE_GRAY16, FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V, FT_PIXEL_MODE_BGRA, + FT_PIXEL_MODE_GRAY16, FT_PIXEL_MODE_MAX /* do not remove */ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 65c37e1d9..bf6f3d4f2 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -88,10 +88,10 @@ "gray 8-bit bitmap", "gray 2-bit bitmap", "gray 4-bit bitmap", - "SDF 16-bit bitmap", "LCD 8-bit bitmap", "vertical LCD 8-bit bitmap", "BGRA 32-bit color image bitmap" + "SDF 16-bit bitmap", }; #endif /* FT_DEBUG_LEVEL_TRACE */