Skip to content

Commit c36edf4

Browse files
mdboommdboom
committed
Fix mono font rendering -- characters are now correctly superimposed. Primarily affects mathtext.
1 parent c5593ee commit c36edf4

File tree

101 files changed

+1
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1
-1
lines changed

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_01.png

7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_02.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_04.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_07.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_09.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_14.png

-1 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_16.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_19.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_21.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_33.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_34.png

7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_37.png

-3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_38.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_41.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_42.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_44.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_cm_56.png

9 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_01.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_02.png

13 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_04.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_16.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_17.png

15 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_19.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_33.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_34.png

7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_37.png

-3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_38.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_41.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_42.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_44.png

16 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_52.png

-1 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_53.png

19 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stix_59.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_01.png

10 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_02.png

14 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_04.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_09.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_14.png

-1 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_16.png

7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_17.png

21 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_19.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_33.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_34.png

7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_37.png

-3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_38.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_41.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_42.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_44.png

16 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_52.png

-1 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_53.png

19 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathfont_stixsans_59.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_09.png

-1 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_33.png

23 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_34.png

30 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_35.png

16 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_38.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_41.png

-6 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_56.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_cm_57.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_09.png

17 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_21.png

4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_22.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_33.png

17 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_34.png

31 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_35.png

11 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_39.png

4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_41.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_50.png

-4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_52.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_56.png

-5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stix_57.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_04.png

2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_06.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_07.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_08.png

0 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_09.png

14 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_12.png

10 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_13.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_15.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_20.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_21.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_22.png

4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_26.png

4 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_33.png

27 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_34.png

27 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_35.png

28 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_38.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_41.png

-7 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_42.png

8 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_46.png

-6 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_47.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_48.png

-2 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_49.png

16 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_50.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_51.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_52.png

5 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_56.png

1 Byte

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_57.png

-3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_58.png

3 Bytes

‎lib/matplotlib/tests/baseline_images/test_mathtext/mathtext_stixsans_64.png

9 Bytes

‎src/ft2font.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ FT2Image::draw_bitmap(FT_Bitmap* bitmap,
145145
for (FT_Int j = x1; j < x2; ++j, ++dst) {
146146
int x = (j - x1 + x_start);
147147
int val = *(src + (x >> 3)) & (1 << (7 - (x & 0x7)));
148-
*dst = val ? 255 : 0;
148+
*dst = val ? 255 : *dst;
149149
}
150150
}
151151
} else {

0 commit comments

Comments
 (0)