* src/truetype/ttgxvar.c: Use enum definitions.
This commit is contained in:
parent
d95a12b88d
commit
1f43affc09
|
@ -1,3 +1,7 @@
|
||||||
|
2018-11-04 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
|
* src/truetype/ttgxvar.c: Use enum definitions.
|
||||||
|
|
||||||
2018-11-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2018-11-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
* src/truetype/ttgxvar.c (ft_var_apply_tuple): Adjust condition.
|
* src/truetype/ttgxvar.c (ft_var_apply_tuple): Adjust condition.
|
||||||
|
|
|
@ -3213,14 +3213,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_TRACE5(( "cvar: there %s %d tuple%s:\n",
|
FT_TRACE5(( "cvar: there %s %d tuple%s:\n",
|
||||||
( tupleCount & 0xFFF ) == 1 ? "is" : "are",
|
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "is" : "are",
|
||||||
tupleCount & 0xFFF,
|
tupleCount & GX_TC_TUPLE_COUNT_MASK,
|
||||||
( tupleCount & 0xFFF ) == 1 ? "" : "s" ));
|
( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
|
||||||
|
|
||||||
if ( FT_NEW_ARRAY( cvt_deltas, face->cvt_size ) )
|
if ( FT_NEW_ARRAY( cvt_deltas, face->cvt_size ) )
|
||||||
goto FExit;
|
goto FExit;
|
||||||
|
|
||||||
for ( i = 0; i < ( tupleCount & 0xFFF ); i++ )
|
for ( i = 0; i < ( tupleCount & GX_TC_TUPLE_COUNT_MASK ); i++ )
|
||||||
{
|
{
|
||||||
FT_UInt tupleDataSize;
|
FT_UInt tupleDataSize;
|
||||||
FT_UInt tupleIndex;
|
FT_UInt tupleIndex;
|
||||||
|
@ -3259,7 +3259,8 @@
|
||||||
|
|
||||||
FT_MEM_COPY(
|
FT_MEM_COPY(
|
||||||
tuple_coords,
|
tuple_coords,
|
||||||
&blend->tuplecoords[( tupleIndex & 0xFFF ) * blend->num_axis],
|
blend->tuplecoords +
|
||||||
|
( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
|
||||||
blend->num_axis * sizeof ( FT_Fixed ) );
|
blend->num_axis * sizeof ( FT_Fixed ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3460,7 +3461,7 @@
|
||||||
/* point indices. */
|
/* point indices. */
|
||||||
|
|
||||||
/* modeled after `af_iup_interp', `_iup_worker_interpolate', and */
|
/* modeled after `af_iup_interp', `_iup_worker_interpolate', and */
|
||||||
/* `Ins_IUP' with spec differences in handling ill-defined cases. */
|
/* `Ins_IUP' with spec differences in handling ill-defined cases. */
|
||||||
static void
|
static void
|
||||||
tt_delta_interpolate( int p1,
|
tt_delta_interpolate( int p1,
|
||||||
int p2,
|
int p2,
|
||||||
|
@ -3794,7 +3795,8 @@
|
||||||
else
|
else
|
||||||
FT_MEM_COPY(
|
FT_MEM_COPY(
|
||||||
tuple_coords,
|
tuple_coords,
|
||||||
&blend->tuplecoords[( tupleIndex & 0xFFF ) * blend->num_axis],
|
blend->tuplecoords +
|
||||||
|
( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
|
||||||
blend->num_axis * sizeof ( FT_Fixed ) );
|
blend->num_axis * sizeof ( FT_Fixed ) );
|
||||||
|
|
||||||
if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
|
if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
|
||||||
|
|
Loading…
Reference in New Issue