Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
5999d47d
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-12-01T20:50:16-05:00
-
01f23c39
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-12-01T23:13:28-05:00
2 changed files:
Changes:
... | ... | @@ -92,27 +92,6 @@ |
92 | 92 | #endif
|
93 | 93 | |
94 | 94 | |
95 | - static FT_Long
|
|
96 | - FT_MulDiv( FT_Long a,
|
|
97 | - FT_Long b,
|
|
98 | - FT_Long c )
|
|
99 | - {
|
|
100 | - FT_Int s;
|
|
101 | - FT_Long d;
|
|
102 | - |
|
103 | - |
|
104 | - s = 1;
|
|
105 | - if ( a < 0 ) { a = -a; s = -1; }
|
|
106 | - if ( b < 0 ) { b = -b; s = -s; }
|
|
107 | - if ( c < 0 ) { c = -c; s = -s; }
|
|
108 | - |
|
109 | - d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c
|
|
110 | - : 0x7FFFFFFFL );
|
|
111 | - |
|
112 | - return ( s > 0 ) ? d : -d;
|
|
113 | - }
|
|
114 | - |
|
115 | - |
|
116 | 95 | static FT_Long
|
117 | 96 | FT_MulDiv_No_Round( FT_Long a,
|
118 | 97 | FT_Long b,
|
... | ... | @@ -2365,16 +2365,16 @@ |
2365 | 2365 | |
2366 | 2366 | if ( dropOutControl & 1 )
|
2367 | 2367 | {
|
2368 | - /* rightmost stub test */
|
|
2369 | - if ( P_Left->next == P_Right &&
|
|
2370 | - P_Left->height == 1 &&
|
|
2368 | + /* upper stub test */
|
|
2369 | + if ( P_Left->height == 1 &&
|
|
2370 | + P_Left->next == P_Right &&
|
|
2371 | 2371 | !( P_Left->flags & Overshoot_Top &&
|
2372 | 2372 | x2 - x1 >= ras.precision_half ) )
|
2373 | 2373 | goto Next_Pair;
|
2374 | 2374 | |
2375 | - /* leftmost stub test */
|
|
2376 | - if ( P_Right->next == P_Left &&
|
|
2377 | - P_Left->offset == 0 &&
|
|
2375 | + /* lower stub test */
|
|
2376 | + if ( P_Left->offset == 0 &&
|
|
2377 | + P_Right->next == P_Left &&
|
|
2378 | 2378 | !( P_Left->flags & Overshoot_Bottom &&
|
2379 | 2379 | x2 - x1 >= ras.precision_half ) )
|
2380 | 2380 | goto Next_Pair;
|