shithub: freetype+ttf2subf

Download patch

ref: 073a4cefbdac04c6b74b097cbb39001a3232db9e
parent: 8ae2a65e095ae8392e8bbaad9847cb415e10cb69
author: Werner Lemberg <[email protected]>
date: Sat Sep 15 05:10:06 EDT 2012 

Use `FT_Module' instead of `FT_Library' argument in property funcs.

This internal change simplifies access to global module data.

* include/freetype/internal/services/svprop.h
(FT_Properties_SetFunc, FT_Properties_GetFunc): Change accordingly.

* src/base/ftobjs.c (ft_property_do), src/autofit/afmodule.c
(af_property_set, af_property_get): Updated.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-09-15  Werner Lemberg  <[email protected]>
+
+	Use `FT_Module' instead of `FT_Library' argument in property funcs.
+
+	This internal change simplifies access to global module data.
+
+	* include/freetype/internal/services/svprop.h
+	(FT_Properties_SetFunc, FT_Properties_GetFunc): Change accordingly.
+
+	* src/base/ftobjs.c (ft_property_do), src/autofit/afmodule.c
+	(af_property_set, af_property_get): Updated.
+
 2012-09-14  Werner Lemberg  <[email protected]>
 
 	[autofit] Update to Unicode 6.1.0.
--- a/include/freetype/internal/services/svprop.h
+++ b/include/freetype/internal/services/svprop.h
@@ -27,12 +27,12 @@
 
 
   typedef FT_Error
-  (*FT_Properties_SetFunc)( FT_Library   library,
+  (*FT_Properties_SetFunc)( FT_Module    module,
                             const char*  property_name,
                             const void*  value );
 
   typedef FT_Error
-  (*FT_Properties_GetFunc)( FT_Library   library,
+  (*FT_Properties_GetFunc)( FT_Module    module,
                             const char*  property_name,
                             void*        value );
 
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -44,11 +44,11 @@
 
 
   FT_Error
-  af_property_set( FT_Library   library,
+  af_property_set( FT_Module    module,
                    const char*  property_name,
                    const void*  value )
   {
-    FT_UNUSED( library );
+    FT_UNUSED( module );
     FT_UNUSED( value );
 
     FT_TRACE0(( "af_property_get: missing property `%s'\n",
@@ -58,13 +58,13 @@
 
 
   FT_Error
-  af_property_get( FT_Library   library,
+  af_property_get( FT_Module    module,
                    const char*  property_name,
                    void*        value )
   {
     FT_Error  error = FT_Err_Ok;
 
-    FT_UNUSED( library );
+    FT_UNUSED( module );
 
 
     if ( !ft_strcmp( property_name, "glyph-to-script-map" ) )
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4456,8 +4456,8 @@
       return FT_Err_Unimplemented_Feature;
     }
 
-    return set ? service->set_property( library, property_name, value )
-               : service->get_property( library, property_name, value );
+    return set ? service->set_property( cur[0], property_name, value )
+               : service->get_property( cur[0], property_name, value );
   }