Shunichi Fuji : gdi32: Adjust FT_MulFix function to Freetype cvs head.

Alexandre Julliard julliard at winehq.org
Thu Sep 4 08:26:41 CDT 2008


Module: wine
Branch: master
Commit: de251e1c62651d8160b340a4fb9d0f9834a8e538
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=de251e1c62651d8160b340a4fb9d0f9834a8e538

Author: Shunichi Fuji <palglowr at gmail.com>
Date:   Wed Sep  3 20:14:17 2008 +0900

gdi32: Adjust FT_MulFix function to Freetype cvs head.

---

 dlls/gdi32/freetype.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index cb351db..74e70ea 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -163,7 +163,11 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Table);
 MAKE_FUNCPTR(FT_Init_FreeType);
 MAKE_FUNCPTR(FT_Load_Glyph);
 MAKE_FUNCPTR(FT_Matrix_Multiply);
+#ifdef FT_MULFIX_INLINED
+#define pFT_MulFix FT_MULFIX_INLINED
+#else
 MAKE_FUNCPTR(FT_MulFix);
+#endif
 MAKE_FUNCPTR(FT_New_Face);
 MAKE_FUNCPTR(FT_New_Memory_Face);
 MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
@@ -2434,7 +2438,9 @@ static BOOL init_freetype(void)
     LOAD_FUNCPTR(FT_Init_FreeType)
     LOAD_FUNCPTR(FT_Load_Glyph)
     LOAD_FUNCPTR(FT_Matrix_Multiply)
+#ifndef FT_MULFIX_INLINED
     LOAD_FUNCPTR(FT_MulFix)
+#endif
     LOAD_FUNCPTR(FT_New_Face)
     LOAD_FUNCPTR(FT_New_Memory_Face)
     LOAD_FUNCPTR(FT_Outline_Get_Bitmap)




More information about the wine-cvs mailing list