summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c70
1 files changed, 29 insertions, 41 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c b/Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c
index aad3e2929aa..b462263de11 100644
--- a/Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c
+++ b/Build/source/libs/freetype2/freetype-src/src/truetype/ttgxvar.c
@@ -4,7 +4,7 @@
*
* TrueType GX Font Variation loader
*
- * Copyright (C) 2004-2021 by
+ * Copyright (C) 2004-2020 by
* David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
*
* This file is part of the FreeType project, and may only be used,
@@ -371,9 +371,8 @@
if ( axisCount != (FT_Long)blend->mmvar->num_axis )
{
- FT_TRACE2(( "ft_var_load_avar:"
- " number of axes in `avar' and `fvar'\n" ));
- FT_TRACE2(( " table are different\n" ));
+ FT_TRACE2(( "ft_var_load_avar: number of axes in `avar' and `fvar'\n"
+ " table are different\n" ));
goto Exit;
}
@@ -487,22 +486,13 @@
if ( itemStore->axisCount != (FT_Long)blend->mmvar->num_axis )
{
FT_TRACE2(( "ft_var_load_item_variation_store:"
- " number of axes in item variation store\n" ));
- FT_TRACE2(( " "
+ " number of axes in item variation store\n"
+ " "
" and `fvar' table are different\n" ));
error = FT_THROW( Invalid_Table );
goto Exit;
}
- /* new constraint in OpenType 1.8.4 */
- if ( itemStore->regionCount >= 32768U )
- {
- FT_TRACE2(( "ft_var_load_item_variation_store:"
- " too many variation region tables\n" ));
- error = FT_THROW( Invalid_Table );
- goto Exit;
- }
-
if ( FT_NEW_ARRAY( itemStore->varRegionList, itemStore->regionCount ) )
goto Exit;
@@ -1525,9 +1515,8 @@
if ( gvar_head.axisCount != (FT_UShort)blend->mmvar->num_axis )
{
- FT_TRACE1(( "ft_var_load_gvar:"
- " number of axes in `gvar' and `cvar'\n" ));
- FT_TRACE1(( " table are different\n" ));
+ FT_TRACE1(( "ft_var_load_gvar: number of axes in `gvar' and `cvar'\n"
+ " table are different\n" ));
error = FT_THROW( Invalid_Table );
goto Exit;
}
@@ -1852,12 +1841,12 @@
FT_TRACE5(( " %d: %.5f\n", i, coord / 65536.0 ));
if ( coord > a->maximum || coord < a->minimum )
{
- FT_TRACE1(( "ft_var_to_normalized: design coordinate %.5f\n",
- coord / 65536.0 ));
- FT_TRACE1(( " is out of range [%.5f;%.5f];"
- " clamping\n",
- a->minimum / 65536.0,
- a->maximum / 65536.0 ));
+ FT_TRACE1((
+ "ft_var_to_normalized: design coordinate %.5f\n"
+ " is out of range [%.5f;%.5f]; clamping\n",
+ coord / 65536.0,
+ a->minimum / 65536.0,
+ a->maximum / 65536.0 ));
if ( coord > a->maximum )
coord = a->maximum;
@@ -2060,7 +2049,7 @@
FT_Var_Axis* a;
FT_Fixed* c;
FT_Var_Named_Style* ns;
- GX_FVar_Head fvar_head = { 0, 0, 0, 0, 0, 0 };
+ GX_FVar_Head fvar_head;
FT_Bool usePsName = 0;
FT_UInt num_instances;
FT_UInt num_axes;
@@ -2126,8 +2115,8 @@
if ( FT_SET_ERROR( face->goto_table( face, TTAG_CFF2,
stream, &table_len ) ) )
{
- FT_TRACE1(( "\n" ));
- FT_TRACE1(( "TT_Get_MM_Var: `gvar' or `CFF2' table is missing\n" ));
+ FT_TRACE1(( "\n"
+ "TT_Get_MM_Var: `gvar' or `CFF2' table is missing\n" ));
goto Exit;
}
}
@@ -2555,17 +2544,17 @@
num_coords = mmvar->num_axis;
}
- FT_TRACE5(( "TT_Set_MM_Blend:\n" ));
- FT_TRACE5(( " normalized design coordinates:\n" ));
+ FT_TRACE5(( "TT_Set_MM_Blend:\n"
+ " normalized design coordinates:\n" ));
for ( i = 0; i < num_coords; i++ )
{
FT_TRACE5(( " %.5f\n", coords[i] / 65536.0 ));
if ( coords[i] < -0x00010000L || coords[i] > 0x00010000L )
{
- FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n",
+ FT_TRACE1(( "TT_Set_MM_Blend: normalized design coordinate %.5f\n"
+ " is out of range [-1;1]\n",
coords[i] / 65536.0 ));
- FT_TRACE1(( " is out of range [-1;1]\n" ));
error = FT_THROW( Invalid_Argument );
goto Exit;
}
@@ -2663,10 +2652,9 @@
}
blend->num_axis = mmvar->num_axis;
- if ( coords )
- FT_MEM_COPY( blend->normalizedcoords,
- coords,
- num_coords * sizeof ( FT_Fixed ) );
+ FT_MEM_COPY( blend->normalizedcoords,
+ coords,
+ num_coords * sizeof ( FT_Fixed ) );
if ( set_design_coords )
ft_var_to_design( face,
@@ -2964,8 +2952,8 @@
if ( !face->blend->avar_loaded )
ft_var_load_avar( face );
- FT_TRACE5(( "TT_Set_Var_Design:\n" ));
- FT_TRACE5(( " normalized design coordinates:\n" ));
+ FT_TRACE5(( "TT_Set_Var_Design:\n"
+ " normalized design coordinates:\n" ));
ft_var_to_normalized( face, num_coords, blend->coords, normalized );
error = tt_set_mm_blend( face, mmvar->num_axis, normalized, 0 );
@@ -3241,16 +3229,16 @@
if ( !blend )
{
- FT_TRACE2(( "\n" ));
- FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" ));
+ FT_TRACE2(( "\n"
+ "tt_face_vary_cvt: no blend specified\n" ));
error = FT_Err_Ok;
goto Exit;
}
if ( !face->cvt )
{
- FT_TRACE2(( "\n" ));
- FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" ));
+ FT_TRACE2(( "\n"
+ "tt_face_vary_cvt: no `cvt ' table\n" ));
error = FT_Err_Ok;
goto Exit;
}