Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
4f357118
by Alexander Borsuk at 2021-12-18T11:09:15+01:00
4 changed files:
Changes:
... | ... | @@ -5729,7 +5729,7 @@ |
5729 | 5729 |
SFNT_Service sfnt;
|
5730 | 5730 |
|
5731 | 5731 |
|
5732 |
- if ( !face || !paint || !paint )
|
|
5732 |
+ if ( !face || !paint )
|
|
5733 | 5733 |
return 0;
|
5734 | 5734 |
|
5735 | 5735 |
if ( !FT_IS_SFNT( face ) )
|
... | ... | @@ -1174,7 +1174,6 @@ |
1174 | 1174 |
font->props_size + 1 ) )
|
1175 | 1175 |
goto Exit;
|
1176 | 1176 |
|
1177 |
- fp = font->props + font->props_size;
|
|
1178 | 1177 |
font->props_size++;
|
1179 | 1178 |
}
|
1180 | 1179 |
|
... | ... | @@ -756,8 +756,6 @@ |
756 | 756 |
byte = (FT_Byte)( 1 << mod );
|
757 | 757 |
|
758 | 758 |
t[t_index].alpha = pixel & byte ? 255 : 0;
|
759 |
- |
|
760 |
- pixel = 0;
|
|
761 | 759 |
}
|
762 | 760 |
}
|
763 | 761 |
}
|
... | ... | @@ -1277,9 +1277,11 @@ |
1277 | 1277 |
|
1278 | 1278 |
default:
|
1279 | 1279 |
error = FT_THROW( Invalid_Argument );
|
1280 |
- goto Exit;
|
|
1281 | 1280 |
}
|
1282 | 1281 |
|
1282 |
+ if ( error != FT_Err_Ok )
|
|
1283 |
+ goto Exit;
|
|
1284 |
+ |
|
1283 | 1285 |
edges = edges->next;
|
1284 | 1286 |
}
|
1285 | 1287 |
|