summaryrefslogtreecommitdiff
path: root/src/type1
diff options
context:
space:
mode:
authorAlexei Podtelezhnikov <apodtele@gmail.com>2018-10-31 22:01:36 -0400
committerAlexei Podtelezhnikov <apodtele@gmail.com>2018-10-31 22:01:36 -0400
commitba03310b5aa6a8b752f892c32f2354aff9a73f78 (patch)
treea7492bc5895f5d2155da7ca3ae929aabb4ae0db9 /src/type1
parent300da33d61512fe98dc6f34e68fbc330120600ba (diff)
downloadfreetype2-ba03310b5aa6a8b752f892c32f2354aff9a73f78.tar.gz
* src/type1/t1load.c (t1_set_mm_blend): Optimized.
Diffstat (limited to 'src/type1')
-rw-r--r--src/type1/t1load.c25
1 files changed, 16 insertions, 9 deletions
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index e358c3255..01befa2d4 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -384,24 +384,31 @@
for ( n = 0; n < blend->num_designs; n++ )
{
FT_Fixed result = 0x10000L; /* 1.0 fixed */
+ FT_Fixed factor;
for ( m = 0; m < blend->num_axis; m++ )
{
- FT_Fixed factor;
-
-
- /* get current blend axis position; */
/* use a default value if we don't have a coordinate */
- factor = m < num_coords ? coords[m] : 0x8000;
- if ( factor < 0 )
- factor = 0;
- if ( factor > 0x10000L )
- factor = 0x10000L;
+ if ( m >= num_coords )
+ {
+ result >>= 1;
+ continue;
+ }
+ /* get current blend axis position */
+ factor = coords[m];
if ( ( n & ( 1 << m ) ) == 0 )
factor = 0x10000L - factor;
+ if ( factor <= 0 )
+ {
+ result = 0;
+ break;
+ }
+ else if ( factor >= 0x10000L )
+ continue;
+
result = FT_MulFix( result, factor );
}