Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
801b7540
by Alexei Podtelezhnikov at 2021-09-14T22:55:50-04:00
3 changed files:
Changes:
... | ... | @@ -1054,11 +1054,11 @@ |
1054 | 1054 |
{
|
1055 | 1055 |
FT_CharMapRec cmaprec;
|
1056 | 1056 |
FT_CharMap cmap;
|
1057 |
- FT_UInt nn;
|
|
1057 |
+ FT_Int nn;
|
|
1058 | 1058 |
CFF_Encoding encoding = &cff->encoding;
|
1059 | 1059 |
|
1060 | 1060 |
|
1061 |
- for ( nn = 0; nn < (FT_UInt)cffface->num_charmaps; nn++ )
|
|
1061 |
+ for ( nn = 0; nn < cffface->num_charmaps; nn++ )
|
|
1062 | 1062 |
{
|
1063 | 1063 |
cmap = cffface->charmaps[nn];
|
1064 | 1064 |
|
... | ... | @@ -1083,7 +1083,7 @@ |
1083 | 1083 |
cmaprec.encoding_id = TT_MS_ID_UNICODE_CS;
|
1084 | 1084 |
cmaprec.encoding = FT_ENCODING_UNICODE;
|
1085 | 1085 |
|
1086 |
- nn = (FT_UInt)cffface->num_charmaps;
|
|
1086 |
+ nn = cffface->num_charmaps;
|
|
1087 | 1087 |
|
1088 | 1088 |
error = FT_CMap_New( &cff_cmap_unicode_class_rec, NULL,
|
1089 | 1089 |
&cmaprec, NULL );
|
... | ... | @@ -1094,7 +1094,7 @@ |
1094 | 1094 |
error = FT_Err_Ok;
|
1095 | 1095 |
|
1096 | 1096 |
/* if no Unicode charmap was previously selected, select this one */
|
1097 |
- if ( !cffface->charmap && nn != (FT_UInt)cffface->num_charmaps )
|
|
1097 |
+ if ( !cffface->charmap && nn != cffface->num_charmaps )
|
|
1098 | 1098 |
cffface->charmap = cffface->charmaps[nn];
|
1099 | 1099 |
|
1100 | 1100 |
Skip_Unicode:
|
... | ... | @@ -1240,11 +1240,11 @@ |
1240 | 1240 |
/* rescale CVT when needed */
|
1241 | 1241 |
if ( size->cvt_ready < 0 )
|
1242 | 1242 |
{
|
1243 |
- FT_UInt i;
|
|
1243 |
+ FT_UShort i;
|
|
1244 | 1244 |
|
1245 | 1245 |
|
1246 | 1246 |
/* all twilight points are originally zero */
|
1247 |
- for ( i = 0; i < (FT_UInt)size->twilight.n_points; i++ )
|
|
1247 |
+ for ( i = 0; i < size->twilight.n_points; i++ )
|
|
1248 | 1248 |
{
|
1249 | 1249 |
size->twilight.org[i].x = 0;
|
1250 | 1250 |
size->twilight.org[i].y = 0;
|
... | ... | @@ -1253,7 +1253,7 @@ |
1253 | 1253 |
}
|
1254 | 1254 |
|
1255 | 1255 |
/* clear storage area */
|
1256 |
- for ( i = 0; i < (FT_UInt)size->storage_size; i++ )
|
|
1256 |
+ for ( i = 0; i < size->storage_size; i++ )
|
|
1257 | 1257 |
size->storage[i] = 0;
|
1258 | 1258 |
|
1259 | 1259 |
size->GS = tt_default_graphics_state;
|
... | ... | @@ -580,7 +580,7 @@ |
580 | 580 |
{
|
581 | 581 |
FT_Error error;
|
582 | 582 |
PS_Blend blend = face->blend;
|
583 |
- FT_UInt n, p;
|
|
583 |
+ FT_UInt n;
|
|
584 | 584 |
FT_Fixed final_blends[T1_MAX_MM_DESIGNS];
|
585 | 585 |
|
586 | 586 |
|
... | ... | @@ -599,7 +599,7 @@ |
599 | 599 |
PS_DesignMap map = blend->design_map + n;
|
600 | 600 |
FT_Long* designs = map->design_points;
|
601 | 601 |
FT_Fixed* blends = map->blend_points;
|
602 |
- FT_Int before = -1, after = -1;
|
|
602 |
+ FT_Int p, before = -1, after = -1;
|
|
603 | 603 |
|
604 | 604 |
|
605 | 605 |
/* use a default value if we don't have a coordinate */
|
... | ... | @@ -608,7 +608,7 @@ |
608 | 608 |
else
|
609 | 609 |
design = ( designs[map->num_points - 1] - designs[0] ) / 2;
|
610 | 610 |
|
611 |
- for ( p = 0; p < (FT_UInt)map->num_points; p++ )
|
|
611 |
+ for ( p = 0; p < (FT_Int)map->num_points; p++ )
|
|
612 | 612 |
{
|
613 | 613 |
FT_Long p_design = designs[p];
|
614 | 614 |
|
... | ... | @@ -622,11 +622,11 @@ |
622 | 622 |
|
623 | 623 |
if ( design < p_design )
|
624 | 624 |
{
|
625 |
- after = (FT_Int)p;
|
|
625 |
+ after = p;
|
|
626 | 626 |
break;
|
627 | 627 |
}
|
628 | 628 |
|
629 |
- before = (FT_Int)p;
|
|
629 |
+ before = p;
|
|
630 | 630 |
}
|
631 | 631 |
|
632 | 632 |
/* now interpolate if necessary */
|