[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ft-devel] warning in freetype 2.4.4
From: |
mpsuzuki |
Subject: |
Re: [ft-devel] warning in freetype 2.4.4 |
Date: |
Fri, 28 Jan 2011 14:25:08 +0900 |
I synchronized the conditionals for raccess_rule_by_darwin_vfs()
to load_face_in_embedded_rfork().
For the case that FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK is
undefined by ftoption.h and FT_Raccess_Guess() returns always,
fake raccess_rule_by_darwin_vfs() is also impplemented.
Could you try attached patch to fix your issue?
Regards,
mpsuzuki
diff --git a/builds/unix/install-sh b/builds/unix/install-sh
old mode 100644
new mode 100755
diff --git a/src/base/ftbase.h b/src/base/ftbase.h
index 6375613..f681e3b 100644
--- a/src/base/ftbase.h
+++ b/src/base/ftbase.h
@@ -49,7 +49,7 @@ FT_BEGIN_HEADER
FT_Face *aface );
-#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
+#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON )
/* Mac OS X/Darwin kernel often changes recommended method to access */
/* the resource fork and older methods makes the kernel issue the */
/* warning of deprecated method. To calm it down, the methods based */
@@ -57,7 +57,7 @@ FT_BEGIN_HEADER
/* the case the resource is opened but found to lack a font in it. */
FT_LOCAL( FT_Bool )
raccess_rule_by_darwin_vfs( FT_UInt rule_index );
-#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
+#endif
FT_END_HEADER
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index 6df2def..240aae0 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -841,6 +841,13 @@
/* Dummy function; just sets errors */
/*************************************************************************/
+ FT_LOCAL_DEF( FT_Bool )
+ raccess_rule_by_darwin_vfs( FT_UInt rule_index )
+ {
+ return FALSE;
+ }
+
+
FT_BASE_DEF( void )
FT_Raccess_Guess( FT_Library library,
FT_Stream stream,