From cfd9bf4284de4e6a82f3b52f6b5e39f7205a6cac Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 27 Jul 2002 22:52:37 +0000 Subject: added missing cast (ThaiFontInfo.info.face is just a gpointer, not an 2002-07-28 Michael Natterer * modules/thai/thai-xft.c (make_glyph): added missing cast (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ modules/thai/thai-fc.c | 2 +- modules/thai/thai-xft.c | 2 +- 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 253ad36b..83ce2b40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 253ad36b..83ce2b40 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 253ad36b..83ce2b40 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 253ad36b..83ce2b40 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 253ad36b..83ce2b40 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 253ad36b..83ce2b40 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +2002-07-28 Michael Natterer + + * modules/thai/thai-xft.c (make_glyph): added missing cast + (ThaiFontInfo.info.face is just a gpointer, not an FT_Face) + Sat Jul 27 09:46:51 2002 Owen Taylor * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c} diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c index 657a61c0..11fd7bff 100644 --- a/modules/thai/thai-fc.c +++ b/modules/thai/thai-fc.c @@ -183,7 +183,7 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c) } index = FT_Get_Char_Index (font_info->info.face, index); - if (index && index <= font_info->info.face->num_glyphs) + if (index && index <= ((FT_Face) font_info->info.face)->num_glyphs) return index; else return 0; diff --git a/modules/thai/thai-xft.c b/modules/thai/thai-xft.c index 657a61c0..11fd7bff 100644 --- a/modules/thai/thai-xft.c +++ b/modules/thai/thai-xft.c @@ -183,7 +183,7 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c) } index = FT_Get_Char_Index (font_info->info.face, index); - if (index && index <= font_info->info.face->num_glyphs) + if (index && index <= ((FT_Face) font_info->info.face)->num_glyphs) return index; else return 0; -- cgit v1.2.1