[pkg-wine-party] [SCM] Debian Wine packaging branch, lenny, updated. wine-1.0.1-1-6-g387418f
The following commit has been merged in the lenny branch:
commit 0ca73452676125173e36a841a7625fe15e562b6d
Author: Ove Kaaven <ovek@arcticnet.no>
Date: Fri Jun 12 18:53:18 2009 +0200
Merged upstream's adjustment for FT_MulFix change in freetype 2.3.8 and later
(commit de251e1c62651d8160b340a4fb9d0f9834a8e538).
Closes: #527645
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 2d614af..e81ab1b 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);
@@ -2438,7 +2442,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)
--
Debian Wine packaging
Reply to: