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.
This commit is contained in:
Werner Lemberg 2012-09-15 09:10:06 +02:00
parent 8ae2a65e09
commit 073a4cefbd
4 changed files with 20 additions and 8 deletions

View File

@ -1,3 +1,15 @@
2012-09-15 Werner Lemberg <wl@gnu.org>
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 <wl@gnu.org> 2012-09-14 Werner Lemberg <wl@gnu.org>
[autofit] Update to Unicode 6.1.0. [autofit] Update to Unicode 6.1.0.

View File

@ -27,12 +27,12 @@ FT_BEGIN_HEADER
typedef FT_Error typedef FT_Error
(*FT_Properties_SetFunc)( FT_Library library, (*FT_Properties_SetFunc)( FT_Module module,
const char* property_name, const char* property_name,
const void* value ); const void* value );
typedef FT_Error typedef FT_Error
(*FT_Properties_GetFunc)( FT_Library library, (*FT_Properties_GetFunc)( FT_Module module,
const char* property_name, const char* property_name,
void* value ); void* value );

View File

@ -44,11 +44,11 @@
FT_Error FT_Error
af_property_set( FT_Library library, af_property_set( FT_Module module,
const char* property_name, const char* property_name,
const void* value ) const void* value )
{ {
FT_UNUSED( library ); FT_UNUSED( module );
FT_UNUSED( value ); FT_UNUSED( value );
FT_TRACE0(( "af_property_get: missing property `%s'\n", FT_TRACE0(( "af_property_get: missing property `%s'\n",
@ -58,13 +58,13 @@
FT_Error FT_Error
af_property_get( FT_Library library, af_property_get( FT_Module module,
const char* property_name, const char* property_name,
void* value ) void* value )
{ {
FT_Error error = FT_Err_Ok; FT_Error error = FT_Err_Ok;
FT_UNUSED( library ); FT_UNUSED( module );
if ( !ft_strcmp( property_name, "glyph-to-script-map" ) ) if ( !ft_strcmp( property_name, "glyph-to-script-map" ) )

View File

@ -4456,8 +4456,8 @@
return FT_Err_Unimplemented_Feature; return FT_Err_Unimplemented_Feature;
} }
return set ? service->set_property( library, property_name, value ) return set ? service->set_property( cur[0], property_name, value )
: service->get_property( library, property_name, value ); : service->get_property( cur[0], property_name, value );
} }