Commit 9bf73ec40798148639be45eadbec22d50dd7f8a4

Werner Lemberg 2009-01-13T17:42:00

Fix C++ compilation. * src/base/ftobjs.c (FT_Get_FSType_Flags): Cast for compilation with C++.

diff --git a/ChangeLog b/ChangeLog
index cf2d54e..70626c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-01-13  Werner Lemberg  <wl@gnu.org>
 
+	* src/base/ftobjs.c (FT_Get_FSType_Flags): Cast for compilation
+	with C++.
+
+2009-01-13  Werner Lemberg  <wl@gnu.org>
+
 	Don't use stdlib.h and friends directly.
 	Reported by Mickey Gabel <mickey@monfort.co.il>.
 
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 65e61db..fc57c95 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (body).                            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by       */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -4393,8 +4393,8 @@
          font_info.fs_type != 0                   )
       return font_info.fs_type;
 
-    if ( ( os2 = FT_Get_Sfnt_Table( face, ft_sfnt_os2 ) ) != NULL &&
-         os2->version != 0xFFFFU                                  )
+    if ( ( os2 = (TT_OS2*)FT_Get_Sfnt_Table( face, ft_sfnt_os2 ) ) != NULL &&
+         os2->version != 0xFFFFU                                           )
       return os2->fsType;
 
     return 0;