[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] dev/wl/VF-fixes 1872713cf 2/6: s/set_instance/set_named_inst
|
From: |
Werner Lemberg |
|
Subject: |
[freetype2] dev/wl/VF-fixes 1872713cf 2/6: s/set_instance/set_named_instance/ |
|
Date: |
Fri, 28 Apr 2023 07:26:55 -0400 (EDT) |
branch: dev/wl/VF-fixes
commit 1872713cf282622ce693a9f5aecb6bbec0312aaa
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>
s/set_instance/set_named_instance/
* include/freetype/internal/services/svmm.h (FT_Set_Instance_Func): Renamed
to...
(FT_Set_Named_Instance_Func): ...this.
(FT_Service_MultiMasters): Rename `set_instance` to `set_named_instance`.
(FT_DEFINE_SERVICE_MULTIMASTERSREC): Updated.
* src/base/ftmm.c (FT_Set_Named_Instance): Updated.
* src/cff/cffdrivr.c (cff_set_instance): Renamed to...
(cff_set_named_instance): ...this.
(cff_service_multi_masters): Updated.
* src/cff/cffobjs.c (cff_face_init): Updated.
* src/truetype/ttdriver.c (tt_service_gx_multi_masters): Updated.
* src/type1/t1driver.c (t1_service_multi_masters): Updated.
---
include/freetype/internal/services/svmm.h | 10 +++++-----
src/base/ftmm.c | 4 ++--
src/cff/cffdrivr.c | 10 ++++++----
src/cff/cffobjs.c | 2 +-
src/truetype/ttdriver.c | 3 ++-
src/type1/t1driver.c | 3 ++-
6 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/include/freetype/internal/services/svmm.h
b/include/freetype/internal/services/svmm.h
index f87b8acf7..80541c4ce 100644
--- a/include/freetype/internal/services/svmm.h
+++ b/include/freetype/internal/services/svmm.h
@@ -70,8 +70,8 @@ FT_BEGIN_HEADER
FT_Fixed* coords );
typedef FT_Error
- (*FT_Set_Instance_Func)( FT_Face face,
- FT_UInt instance_index );
+ (*FT_Set_Named_Instance_Func)( FT_Face face,
+ FT_UInt instance_index );
typedef FT_Error
(*FT_Get_Default_Named_Instance_Func)( FT_Face face,
@@ -138,7 +138,7 @@ FT_BEGIN_HEADER
FT_Get_MM_Var_Func get_mm_var;
FT_Set_Var_Design_Func set_var_design;
FT_Get_Var_Design_Func get_var_design;
- FT_Set_Instance_Func set_instance;
+ FT_Set_Named_Instance_Func set_named_instance;
FT_Get_Default_Named_Instance_Func get_default_named_instance;
FT_Set_MM_WeightVector_Func set_mm_weightvector;
FT_Get_MM_WeightVector_Func get_mm_weightvector;
@@ -162,7 +162,7 @@ FT_BEGIN_HEADER
get_mm_var_, \
set_var_design_, \
get_var_design_, \
- set_instance_, \
+ set_named_instance_, \
get_default_named_instance_, \
set_weightvector_, \
get_weightvector_, \
@@ -182,7 +182,7 @@ FT_BEGIN_HEADER
get_mm_var_, \
set_var_design_, \
get_var_design_, \
- set_instance_, \
+ set_named_instance_, \
get_default_named_instance_, \
set_weightvector_, \
get_weightvector_, \
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index 781db315e..1d5e2bcca 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -535,8 +535,8 @@
if ( !error )
{
error = FT_ERR( Invalid_Argument );
- if ( service_mm->set_instance )
- error = service_mm->set_instance( face, instance_index );
+ if ( service_mm->set_named_instance )
+ error = service_mm->set_named_instance( face, instance_index );
}
if ( !error )
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 4bf50a720..49f18c28d 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -932,13 +932,13 @@
static FT_Error
- cff_set_instance( CFF_Face face,
- FT_UInt instance_index )
+ cff_set_named_instance( CFF_Face face,
+ FT_UInt instance_index )
{
FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm;
- return mm->set_instance( FT_FACE( face ), instance_index );
+ return mm->set_named_instance( FT_FACE( face ), instance_index );
}
@@ -1027,7 +1027,9 @@
(FT_Get_MM_Var_Func) cff_get_mm_var, /* get_mm_var
*/
(FT_Set_Var_Design_Func)cff_set_var_design, /* set_var_design
*/
(FT_Get_Var_Design_Func)cff_get_var_design, /* get_var_design
*/
- (FT_Set_Instance_Func) cff_set_instance, /* set_instance
*/
+ (FT_Set_Named_Instance_Func)
+ cff_set_named_instance,
+ /* set_named_instance
*/
(FT_Get_Default_Named_Instance_Func)
cff_get_default_named_instance,
/* get_default_named_instance
*/
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 9608a4178..2285c1a48 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -731,7 +731,7 @@
mm &&
instance_index > 0 )
{
- error = mm->set_instance( cffface, instance_index );
+ error = mm->set_named_instance( cffface, instance_index );
if ( error )
goto Exit;
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index c128be19d..54ad932ed 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -524,7 +524,8 @@
(FT_Get_MM_Var_Func) TT_Get_MM_Var, /* get_mm_var
*/
(FT_Set_Var_Design_Func)TT_Set_Var_Design, /* set_var_design
*/
(FT_Get_Var_Design_Func)TT_Get_Var_Design, /* get_var_design
*/
- (FT_Set_Instance_Func) TT_Set_Named_Instance, /* set_instance
*/
+ (FT_Set_Named_Instance_Func)
+ TT_Set_Named_Instance, /* set_named_instance
*/
(FT_Get_Default_Named_Instance_Func)
TT_Get_Default_Named_Instance,
/*
get_default_named_instance */
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 5d0fe533c..4239d86fe 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -128,7 +128,8 @@
(FT_Get_MM_Var_Func) T1_Get_MM_Var, /* get_mm_var
*/
(FT_Set_Var_Design_Func)T1_Set_Var_Design, /* set_var_design
*/
(FT_Get_Var_Design_Func)T1_Get_Var_Design, /* get_var_design
*/
- (FT_Set_Instance_Func) T1_Reset_MM_Blend, /* set_instance
*/
+ (FT_Set_Named_Instance_Func)
+ T1_Reset_MM_Blend, /* set_named_instance
*/
(FT_Get_Default_Named_Instance_Func)
NULL, /*
get_default_named_instance */
(FT_Set_MM_WeightVector_Func)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] dev/wl/VF-fixes 1872713cf 2/6: s/set_instance/set_named_instance/,
Werner Lemberg <=