From 06820637e2e1b6779c0157abb11a3bb4d65e1f53 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 14 May 2018 09:45:16 +0200 Subject: [PATCH] * src/base/ftobjs.c (FT_Load_Glyph): Fix signature of `pixel_modes'. --- ChangeLog | 4 ++++ src/base/ftobjs.c | 20 +++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f94ffcfd..be867e844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-05-14 Werner Lemberg + + * src/base/ftobjs.c (FT_Load_Glyph): Fix signature of `pixel_modes'. + 2018-05-14 Werner Lemberg Provide dummy functions if `TT_CONFIG_OPTION_SFNT_NAMES' is not set. diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 2731903eb..3590ce16f 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -1026,15 +1026,17 @@ #ifdef FT_DEBUG_LEVEL_TRACE { - const char* pixel_modes[] = { "none", - "monochrome bitmap", - "gray 8-bit bitmap", - "gray 2-bit bitmap", - "gray 4-bit bitmap", - "LCD 8-bit bitmap", - "vertical LCD 8-bit bitmap", - "BGRA 32-bit color image bitmap" - }; + static const char* const pixel_modes[] = + { + "none", + "monochrome bitmap", + "gray 8-bit bitmap", + "gray 2-bit bitmap", + "gray 4-bit bitmap", + "LCD 8-bit bitmap", + "vertical LCD 8-bit bitmap", + "BGRA 32-bit color image bitmap" + }; FT_TRACE5(( "FT_Load_Glyph: index %d, flags 0x%x\n",