minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

Minor type adjustments. 

* src/cff/cffobjs.c (cff_face_init): Reduce casting.
* src/truetype/ttobjs.c (tt_size_ready_bytecode): Ditto.
* src/type1/t1load.c (T1_Set_MM_Design): Ditto.
This commit is contained in:
Alexei Podtelezhnikov 2021-09-14 22:55:50 -04:00
parent 49270c1701
commit 801b7540dc
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cff/cffobjs.c
View File

@ -1054,11 +1054,11 @@
{
FT_CharMapRec cmaprec;
FT_CharMap cmap;
FT_UInt nn;
FT_Int nn;
CFF_Encoding encoding = &cff->encoding;
for ( nn = 0; nn < (FT_UInt)cffface->num_charmaps; nn++ )
for ( nn = 0; nn < cffface->num_charmaps; nn++ )
{
cmap = cffface->charmaps[nn];
@ -1083,7 +1083,7 @@
cmaprec.encoding_id = TT_MS_ID_UNICODE_CS;
cmaprec.encoding = FT_ENCODING_UNICODE;
nn = (FT_UInt)cffface->num_charmaps;
nn = cffface->num_charmaps;
error = FT_CMap_New( &cff_cmap_unicode_class_rec, NULL,
&cmaprec, NULL );
@ -1094,7 +1094,7 @@
error = FT_Err_Ok;
/* if no Unicode charmap was previously selected, select this one */
if ( !cffface->charmap && nn != (FT_UInt)cffface->num_charmaps )
if ( !cffface->charmap && nn != cffface->num_charmaps )
cffface->charmap = cffface->charmaps[nn];
Skip_Unicode:

6
src/truetype/ttobjs.c
View File

@ -1240,11 +1240,11 @@
/* rescale CVT when needed */
if ( size->cvt_ready < 0 )
{
FT_UInt i;
FT_UShort i;
/* all twilight points are originally zero */
for ( i = 0; i < (FT_UInt)size->twilight.n_points; i++ )
for ( i = 0; i < size->twilight.n_points; i++ )
{
size->twilight.org[i].x = 0;
size->twilight.org[i].y = 0;
@ -1253,7 +1253,7 @@
}
/* clear storage area */
for ( i = 0; i < (FT_UInt)size->storage_size; i++ )
for ( i = 0; i < size->storage_size; i++ )
size->storage[i] = 0;
size->GS = tt_default_graphics_state;

10
src/type1/t1load.c
View File

@ -580,7 +580,7 @@
{
FT_Error error;
PS_Blend blend = face->blend;
FT_UInt n, p;
FT_UInt n;
FT_Fixed final_blends[T1_MAX_MM_DESIGNS];
@ -599,7 +599,7 @@
PS_DesignMap map = blend->design_map + n;
FT_Long* designs = map->design_points;
FT_Fixed* blends = map->blend_points;
FT_Int before = -1, after = -1;
FT_Int p, before = -1, after = -1;
/* use a default value if we don't have a coordinate */
@ -608,7 +608,7 @@
else
design = ( designs[map->num_points - 1] - designs[0] ) / 2;
for ( p = 0; p < (FT_UInt)map->num_points; p++ )
for ( p = 0; p < (FT_Int)map->num_points; p++ )
{
FT_Long p_design = designs[p];
@ -622,11 +622,11 @@
if ( design < p_design )
{
after = (FT_Int)p;
after = p;
break;
}
before = (FT_Int)p;
before = p;
}
/* now interpolate if necessary */