Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
85168499
by Alexei Podtelezhnikov at 2021-03-09T22:14:44-05:00
2 changed files:
Changes:
1 |
+2021-03-09 Alexei Podtelezhnikov <apodtele@gmail.com>
|
|
2 |
+ |
|
3 |
+ * src/smooth/ftgrays.c (gray_render_line): Rearrange conditionals.
|
|
4 |
+ |
|
5 |
+ These produce faster or more optimizable code.
|
|
6 |
+ |
|
1 | 7 |
2021-03-08 Tim-Philipp Müller <tim@centricular.com>
|
2 | 8 |
|
3 | 9 |
[meson] Fix 'mmap' handling on Windows.
|
... | ... | @@ -912,8 +912,8 @@ typedef ptrdiff_t FT_PtrDist; |
912 | 912 |
/* also easily updated when moving from one cell to the next. */
|
913 | 913 |
do
|
914 | 914 |
{
|
915 |
- if ( prod <= 0 &&
|
|
916 |
- prod - dx * ONE_PIXEL > 0 ) /* left */
|
|
915 |
+ if ( prod - dx * ONE_PIXEL > 0 &&
|
|
916 |
+ prod <= 0 ) /* left */
|
|
917 | 917 |
{
|
918 | 918 |
fx2 = 0;
|
919 | 919 |
fy2 = FT_UDIV( -prod, -dx );
|
... | ... | @@ -924,8 +924,8 @@ typedef ptrdiff_t FT_PtrDist; |
924 | 924 |
fy1 = fy2;
|
925 | 925 |
ex1--;
|
926 | 926 |
}
|
927 |
- else if ( prod - dx * ONE_PIXEL <= 0 &&
|
|
928 |
- prod - dx * ONE_PIXEL + dy * ONE_PIXEL > 0 ) /* up */
|
|
927 |
+ else if ( prod - dx * ONE_PIXEL + dy * ONE_PIXEL > 0 &&
|
|
928 |
+ prod - dx * ONE_PIXEL <= 0 ) /* up */
|
|
929 | 929 |
{
|
930 | 930 |
prod -= dx * ONE_PIXEL;
|
931 | 931 |
fx2 = FT_UDIV( -prod, dy );
|
... | ... | @@ -936,8 +936,8 @@ typedef ptrdiff_t FT_PtrDist; |
936 | 936 |
fy1 = 0;
|
937 | 937 |
ey1++;
|
938 | 938 |
}
|
939 |
- else if ( prod - dx * ONE_PIXEL + dy * ONE_PIXEL <= 0 &&
|
|
940 |
- prod + dy * ONE_PIXEL >= 0 ) /* right */
|
|
939 |
+ else if ( prod + dy * ONE_PIXEL >= 0 &&
|
|
940 |
+ prod - dx * ONE_PIXEL + dy * ONE_PIXEL <= 0 ) /* right */
|
|
941 | 941 |
{
|
942 | 942 |
prod += dy * ONE_PIXEL;
|
943 | 943 |
fx2 = ONE_PIXEL;
|
... | ... | @@ -948,8 +948,8 @@ typedef ptrdiff_t FT_PtrDist; |
948 | 948 |
fy1 = fy2;
|
949 | 949 |
ex1++;
|
950 | 950 |
}
|
951 |
- else /* ( prod + dy * ONE_PIXEL < 0 &&
|
|
952 |
- prod > 0 ) down */
|
|
951 |
+ else /* ( prod > 0 &&
|
|
952 |
+ prod + dy * ONE_PIXEL < 0 ) down */
|
|
953 | 953 |
{
|
954 | 954 |
fx2 = FT_UDIV( prod, -dy );
|
955 | 955 |
fy2 = 0;
|