diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index c6348ac486f1..0e4d832ba67e 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -341,10 +341,9 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0, # means scaling the transform just slightly to account for the # extra subpixel. if (t.is_affine and round_to_pixel_border and - (out_width_base % 1.0 != 0.0 or - out_height_base % 1.0 != 0.0)): - out_width = int(ceil(out_width_base) + 1) - out_height = int(ceil(out_height_base) + 1) + (out_width_base % 1.0 != 0.0 or out_height_base % 1.0 != 0.0)): + out_width = int(ceil(out_width_base)) + out_height = int(ceil(out_height_base)) extra_width = (out_width - out_width_base) / out_width_base extra_height = (out_height - out_height_base) / out_height_base t += Affine2D().scale( diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.pdf b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.pdf index 9985e3057769..919ae14014e6 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.pdf and b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png index bdfcfadfab80..9ec9980c498f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png and b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.svg b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.svg index 7e084ad751a8..240f7789944a 100644 --- a/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.svg +++ b/lib/matplotlib/tests/baseline_images/test_axes/hist2d_transpose.svg @@ -26,8 +26,8 @@ L 72 43.2 z " style="fill:#ffffff;"/> - + +" id="mbfb5ef27c5" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="meea3dd2a86" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -135,12 +135,12 @@ Q 48.484375 72.75 52.59375 71.296875 - + - + @@ -193,12 +193,12 @@ Q 18.3125 60.0625 18.3125 54.390625 - + - + @@ -258,12 +258,12 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + @@ -303,12 +303,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -327,20 +327,20 @@ Q 31.109375 20.453125 19.1875 8.296875 +" id="m3d80f73659" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m8f1eb87680" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -362,12 +362,12 @@ z - + - + @@ -414,12 +414,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -433,12 +433,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -467,12 +467,12 @@ z - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow.png index 19685c8a8142..db17406bcf32 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow.png and b/lib/matplotlib/tests/baseline_images/test_axes/imshow.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png index e3ece2cca34b..83f77495efca 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png and b/lib/matplotlib/tests/baseline_images/test_axes/imshow_clip.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_freqs.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_freqs.png index 7f845c02ae67..a9ee3287e1ee 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_freqs.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_freqs.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_noise.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_noise.png index dff0b83fb197..21b07d8a0a7f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_noise.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_angle_noise.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs.png index 2c41255339d8..1a4636d01c2d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs_linear.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs_linear.png index 2c41255339d8..1a4636d01c2d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs_linear.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_freqs_linear.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs.png index 52ed7916d31e..105ae8b9ef75 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs_linear.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs_linear.png index 52ed7916d31e..105ae8b9ef75 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs_linear.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_freqs_linear.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise.png index 7eb3077f905d..43c7d93810d0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise_linear.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise_linear.png index 7eb3077f905d..43c7d93810d0 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise_linear.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_magnitude_noise_linear.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise.png index 7d6a4d885634..37c80c2b8499 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise_linear.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise_linear.png index 7d6a4d885634..37c80c2b8499 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise_linear.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_noise_linear.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_freqs.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_freqs.png index 5366ec72310f..fd32764ab1ad 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_freqs.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_freqs.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_noise.png b/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_noise.png index c826a5332e8a..18ca542feaaf 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_noise.png and b/lib/matplotlib/tests/baseline_images/test_axes/specgram_phase_noise.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/grayscale_alpha.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/grayscale_alpha.pdf index 28e89a00700a..e893648cd0f2 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_backend_pdf/grayscale_alpha.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_pdf/grayscale_alpha.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.pdf b/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.pdf index bbc0c52c05cf..15c936058d75 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.pdf and b/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.svg b/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.svg index 2fda0beda1d0..b06e1199885e 100644 --- a/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.svg +++ b/lib/matplotlib/tests/baseline_images/test_backend_svg/noscale.svg @@ -26,8 +26,8 @@ L 122.4 43.2 z " style="fill:#ffffff;"/> - - + @@ -56,68 +56,68 @@ L 468 43.2 +" id="m86253aeba3" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m35ce5236a2" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -128,68 +128,68 @@ L 0 4 +" id="m6c77fba4bf" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mff53476490" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -197,7 +197,7 @@ L -4 0 - + diff --git a/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png b/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png index 6e3d0fee2d12..222ebca02d82 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png and b/lib/matplotlib/tests/baseline_images/test_colors/light_source_shading_topo.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf index ddb75003e216..6bf2a8f97aa8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf and b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg index a2b6761d5da3..d5de3e58a0d6 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/bbox_image_inverted.svg @@ -26,9 +26,9 @@ L 72 43.2 z " style="fill:#ffffff;"/> - - + + +" id="mc2896f9f5e" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mec25d8b5fb" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -140,80 +140,80 @@ L 0 4 +" id="m1a4b15aa35" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m9027fdd9d8" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -221,13 +221,8 @@ L -4 0 - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.pdf index 98060d692504..6411ec5fe76c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.pdf and b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.png b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.png index 7a9281f6ab64..880cc891887b 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.png and b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.svg b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.svg index a46daa66e4c3..66fd823c2f84 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/image_alpha.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/image_alpha.svg @@ -26,8 +26,8 @@ L 72 150.352941 z " style="fill:#ffffff;"/> - - + @@ -56,80 +56,80 @@ L 203.294118 150.352941 +" id="mbe1d45af35" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m04a3004067" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -140,80 +140,80 @@ L 0 4 +" id="m619f49e421" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m4bfb07cba7" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + @@ -228,8 +228,8 @@ L 229.552941 150.352941 z " style="fill:#ffffff;"/> - - + @@ -256,72 +256,72 @@ L 360.847059 150.352941 - + - + - + - + - + - + - + - + - + - + - + - + @@ -330,72 +330,72 @@ L 360.847059 150.352941 - + - + - + - + - + - + - + - + - + - + - + - + @@ -410,9 +410,9 @@ L 387.105882 150.352941 z " style="fill:#ffffff;"/> - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -512,72 +512,72 @@ L 518.4 150.352941 - + - + - + - + - + - + - + - + - + - + - + - + @@ -585,13 +585,13 @@ L 518.4 150.352941 - + - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf index c920ccefb2c2..628dadb0a68c 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf and b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png index 2f82a873d20f..f08646797f71 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png and b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg index b0e9c702addb..668c1bed033b 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg @@ -26,9 +26,9 @@ L 156.96 43.2 z " style="fill:#ff0000;fill-opacity:0.5;"/> - - + + +" id="mb6d24098e1" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mc3a89dc848" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -152,104 +152,104 @@ L 0 4 +" id="m208f36b844" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m0a4c5e5367" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -257,13 +257,8 @@ L -4 0 - - + + diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf index bb8ef50a5a99..6b3418faacd8 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf and b/lib/matplotlib/tests/baseline_images/test_image/image_interps.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.png b/lib/matplotlib/tests/baseline_images/test_image/image_interps.png index 7420c8dad9a4..504d083f08d4 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_interps.png and b/lib/matplotlib/tests/baseline_images/test_image/image_interps.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg b/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg index 12956bf6b6e8..7e1df8c4bc5a 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/image_interps.svg @@ -26,9 +26,9 @@ L 91.905882 43.2 z " style="fill:#ffffff;"/> - - + + +" id="m037dd2abee" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m63be751dbc" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -103,12 +103,12 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + @@ -147,12 +147,12 @@ z - + - + @@ -181,12 +181,12 @@ z - + - + @@ -204,20 +204,20 @@ z +" id="mf7a79efe72" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m562fb37789" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -230,12 +230,12 @@ L -4 0 - + - + @@ -248,12 +248,12 @@ L -4 0 - + - + @@ -291,12 +291,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -342,12 +342,12 @@ Q 46.96875 40.921875 40.578125 39.3125 - + - + @@ -645,9 +645,9 @@ L 91.905882 165.176471 z " style="fill:#ffffff;"/> - - + + - + - + @@ -691,12 +691,12 @@ L 498.494118 165.176471 - + - + @@ -709,12 +709,12 @@ L 498.494118 165.176471 - + - + @@ -728,12 +728,12 @@ L 498.494118 165.176471 - + - + @@ -749,12 +749,12 @@ L 498.494118 165.176471 - + - + @@ -767,12 +767,12 @@ L 498.494118 165.176471 - + - + @@ -785,12 +785,12 @@ L 498.494118 165.176471 - + - + @@ -803,12 +803,12 @@ L 498.494118 165.176471 - + - + @@ -821,12 +821,12 @@ L 498.494118 165.176471 - + - + @@ -886,9 +886,9 @@ L 91.905882 287.152941 z " style="fill:#ffffff;"/> - - + + - + - + @@ -932,12 +932,12 @@ L 498.494118 287.152941 - + - + @@ -950,12 +950,12 @@ L 498.494118 287.152941 - + - + @@ -969,12 +969,12 @@ L 498.494118 287.152941 - + - + @@ -990,12 +990,12 @@ L 498.494118 287.152941 - + - + @@ -1008,12 +1008,12 @@ L 498.494118 287.152941 - + - + @@ -1026,12 +1026,12 @@ L 498.494118 287.152941 - + - + @@ -1044,12 +1044,12 @@ L 498.494118 287.152941 - + - + @@ -1062,12 +1062,12 @@ L 498.494118 287.152941 - + - + @@ -1135,13 +1135,13 @@ z - + - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_shift.pdf b/lib/matplotlib/tests/baseline_images/test_image/image_shift.pdf index b3ad9e70f65b..03aad738e573 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/image_shift.pdf and b/lib/matplotlib/tests/baseline_images/test_image/image_shift.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/image_shift.svg b/lib/matplotlib/tests/baseline_images/test_image/image_shift.svg index bf0dae1fcb51..6194c61eac93 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/image_shift.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/image_shift.svg @@ -26,8 +26,8 @@ L 72 43.2 z " style="fill:#ffffff;"/> - - + @@ -56,68 +56,68 @@ L 518.399963 43.2 +" id="m143d8d1cb4" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m05bc0c35b8" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -128,68 +128,68 @@ L 0 4 +" id="m1cd92336dc" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mb876dd376c" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -197,7 +197,7 @@ L -4 0 - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf b/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf index 4424d20e25a9..deab892aa71d 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf and b/lib/matplotlib/tests/baseline_images/test_image/imshow.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow.svg b/lib/matplotlib/tests/baseline_images/test_image/imshow.svg index 01baa4d43c60..a87c2a96caaa 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/imshow.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/imshow.svg @@ -26,9 +26,9 @@ L 122.4 43.2 z " style="fill:#ffffff;"/> - - + + +" id="m307aa2ad97" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m14680a7cf0" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -152,92 +152,92 @@ L 0 4 +" id="mf8a56999ee" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m87c6657c17" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -245,7 +245,7 @@ L -4 0 - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_endianess.png b/lib/matplotlib/tests/baseline_images/test_image/imshow_endianess.png index 148acf125174..28a7ef2a66e9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/imshow_endianess.png and b/lib/matplotlib/tests/baseline_images/test_image/imshow_endianess.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.pdf b/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.pdf index 44bf11c65365..67e39f8cb112 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.pdf and b/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.svg b/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.svg index 1eabc9fb8638..45f92fce89b7 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/interp_nearest_vs_none.svg @@ -26,8 +26,8 @@ L 72 114.545455 z " style="fill:#ffffff;"/> - - + @@ -56,68 +56,68 @@ L 274.909091 114.545455 +" id="m3742ea2283" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="ma5a500ab27" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -128,68 +128,68 @@ L 0 4 +" id="macc9b582d5" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mb27abdf87e" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -204,9 +204,9 @@ L 315.490909 114.545455 z " style="fill:#ffffff;"/> - - + + - + - + - + - + - + - + - + - + - + - + @@ -294,60 +294,60 @@ L 518.4 114.545455 - + - + - + - + - + - + - + - + - + - + @@ -355,10 +355,10 @@ L 518.4 114.545455 - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image.pdf b/lib/matplotlib/tests/baseline_images/test_image/mask_image.pdf index 695b149f03dd..8c7a58e1553a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/mask_image.pdf and b/lib/matplotlib/tests/baseline_images/test_image/mask_image.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image.png b/lib/matplotlib/tests/baseline_images/test_image/mask_image.png index 1e4f2873e39f..4779a5ea67e3 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/mask_image.png and b/lib/matplotlib/tests/baseline_images/test_image/mask_image.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image.svg b/lib/matplotlib/tests/baseline_images/test_image/mask_image.svg index 174c5942c2ca..0f9181a6c1c3 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/mask_image.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/mask_image.svg @@ -26,9 +26,9 @@ L 72 114.545455 z " style="fill:#ffffff;"/> - - + + +" id="m3867267453" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m43422ca658" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -128,68 +128,68 @@ L 0 4 +" id="ma32f28a124" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mfc95862112" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -204,9 +204,9 @@ L 315.490909 114.545455 z " style="fill:#ffffff;"/> - - + + - + - + - + - + - + - + - + - + - + - + @@ -294,60 +294,60 @@ L 518.4 114.545455 - + - + - + - + - + - + - + - + - + - + @@ -355,10 +355,10 @@ L 518.4 114.545455 - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png b/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png index 1bd52f6171a7..6433cd355e85 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png and b/lib/matplotlib/tests/baseline_images/test_image/mask_image_over_under.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.pdf b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.pdf index 72edbcaba30d..1c44402b6426 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.pdf and b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.png b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.png index f8364010cdb7..c4b26de1a284 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.png and b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.svg b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.svg index 2610cd9ecfbd..e770d04802f0 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/no_interpolation_origin.svg @@ -26,8 +26,8 @@ L 72 112.817455 z " style="fill:#ffffff;"/> - - + @@ -56,68 +56,68 @@ L 518.4 112.817455 +" id="m09328382f5" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mab60619363" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -128,68 +128,68 @@ L 0 4 +" id="m47abd22b4b" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m11dc51ef9d" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + @@ -204,8 +204,8 @@ L 72 301.326545 z " style="fill:#ffffff;"/> - - + @@ -232,60 +232,60 @@ L 518.4 301.326545 - + - + - + - + - + - + - + - + - + - + @@ -294,60 +294,60 @@ L 518.4 301.326545 - + - + - + - + - + - + - + - + - + - + @@ -355,10 +355,10 @@ L 518.4 301.326545 - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf index cc4bf3d335f6..d890b7fd9953 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf and b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg index 0bda035de8c5..1b9fcb533371 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg @@ -26,9 +26,9 @@ L 27 11.382353 z " style="fill:#ffffff;"/> - - + + @@ -42,7 +42,7 @@ L 86.082353 7.2 z " style="fill:#ffffff;"/> - @@ -57,7 +57,7 @@ z " style="fill:#ffffff;"/> - @@ -66,10 +66,10 @@ L 194.4 26.4 - + - + diff --git a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.pdf b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.pdf index f205e7ca7468..127333c64c2a 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.pdf and b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.png b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.png index cb1853ed179a..322e8c00478f 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.png and b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.svg b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.svg index 14bf516177d3..33bce7b436e3 100644 --- a/lib/matplotlib/tests/baseline_images/test_image/rotate_image.svg +++ b/lib/matplotlib/tests/baseline_images/test_image/rotate_image.svg @@ -26,13 +26,12 @@ L 165.6 43.2 z " style="fill:#ffffff;"/> - - + - @@ -63,92 +62,92 @@ L 424.8 43.2 +" id="mfa04677d03" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="mcd546feda0" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -159,116 +158,116 @@ L 0 4 +" id="m8286196f2a" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m5b4d3a0a9e" style="stroke:#000000;stroke-width:0.5;"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -276,7 +275,7 @@ L -4 0 - + diff --git a/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png index 263b8fcc7f37..79abf893f320 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png and b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.pdf b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.pdf index 8e064feab89d..d278fe84adc9 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.pdf and b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.png b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.png index c80a751456e3..b28d5098b835 100644 Binary files a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.png and b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg index c6a21e97ac4c..b0c6bbfab3ce 100644 --- a/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg +++ b/lib/matplotlib/tests/baseline_images/test_tightlayout/tight_layout5.svg @@ -26,8 +26,8 @@ L 92.620156 12.96 z " style="fill:#ffffff;"/> - - + @@ -56,20 +56,20 @@ L 483.379844 12.96 +" id="m54842846a8" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m94ffb68df8" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -103,12 +103,12 @@ Q 19.53125 74.21875 31.78125 74.21875 - + - + @@ -146,12 +146,12 @@ Q 31.109375 20.453125 19.1875 8.296875 - + - + @@ -183,12 +183,12 @@ z - + - + @@ -231,12 +231,12 @@ Q 48.484375 72.75 52.59375 71.296875 - + - + @@ -291,20 +291,20 @@ Q 18.3125 60.0625 18.3125 54.390625 +" id="m35a97357aa" style="stroke:#000000;stroke-width:0.5;"/> - + +" id="m4bad1c7a88" style="stroke:#000000;stroke-width:0.5;"/> - + @@ -317,12 +317,12 @@ L -4 0 - + - + @@ -335,12 +335,12 @@ L -4 0 - + - + @@ -353,12 +353,12 @@ L -4 0 - + - + @@ -371,12 +371,12 @@ L -4 0 - + - + @@ -390,7 +390,7 @@ L -4 0 - + diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 0bcbaa492b45..58c57448daac 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -2969,16 +2969,17 @@ def test_subplot_key_hash(): @image_comparison(baseline_images=['specgram_freqs', 'specgram_freqs_linear'], - remove_text=True, extensions=['png'], tol=0.07) + remove_text=True, extensions=['png'], tol=0.07, + style='default') def test_specgram_freqs(): '''test axes.specgram in default (psd) mode with sinusoidal stimuli''' - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. fstims1 = [Fs/4, Fs/5, Fs/11] fstims2 = [Fs/4.7, Fs/5.6, Fs/11.9] - NFFT = int(1000 * Fs / min(fstims1 + fstims2)) + NFFT = int(10 * Fs / min(fstims1 + fstims2)) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3022,15 +3023,16 @@ def test_specgram_freqs(): @image_comparison(baseline_images=['specgram_noise', 'specgram_noise_linear'], - remove_text=True, extensions=['png'], tol=0.01) + remove_text=True, extensions=['png'], tol=0.01, + style='default') def test_specgram_noise(): '''test axes.specgram in default (psd) mode with noise stimuli''' np.random.seed(0) - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. - NFFT = int(1000 * Fs / 11) + NFFT = int(10 * Fs / 11) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3069,16 +3071,17 @@ def test_specgram_noise(): @image_comparison(baseline_images=['specgram_magnitude_freqs', 'specgram_magnitude_freqs_linear'], - remove_text=True, extensions=['png'], tol=0.07) + remove_text=True, extensions=['png'], tol=0.07, + style='default') def test_specgram_magnitude_freqs(): '''test axes.specgram in magnitude mode with sinusoidal stimuli''' - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. fstims1 = [Fs/4, Fs/5, Fs/11] fstims2 = [Fs/4.7, Fs/5.6, Fs/11.9] - NFFT = int(1000 * Fs / min(fstims1 + fstims2)) + NFFT = int(100 * Fs / min(fstims1 + fstims2)) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3124,15 +3127,16 @@ def test_specgram_magnitude_freqs(): @image_comparison(baseline_images=['specgram_magnitude_noise', 'specgram_magnitude_noise_linear'], - remove_text=True, extensions=['png']) + remove_text=True, extensions=['png'], + style='default') def test_specgram_magnitude_noise(): '''test axes.specgram in magnitude mode with noise stimuli''' np.random.seed(0) - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. - NFFT = int(1000 * Fs / 11) + NFFT = int(10 * Fs / 11) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3170,16 +3174,17 @@ def test_specgram_magnitude_noise(): @image_comparison(baseline_images=['specgram_angle_freqs'], - remove_text=True, extensions=['png'], tol=0.007) + remove_text=True, extensions=['png'], tol=0.007, + style='default') def test_specgram_angle_freqs(): '''test axes.specgram in angle mode with sinusoidal stimuli''' - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. fstims1 = [Fs/4, Fs/5, Fs/11] fstims2 = [Fs/4.7, Fs/5.6, Fs/11.9] - NFFT = int(1000 * Fs / min(fstims1 + fstims2)) + NFFT = int(10 * Fs / min(fstims1 + fstims2)) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3225,15 +3230,16 @@ def test_specgram_angle_freqs(): @image_comparison(baseline_images=['specgram_angle_noise'], - remove_text=True, extensions=['png']) + remove_text=True, extensions=['png'], + style='default') def test_specgram_noise_angle(): '''test axes.specgram in angle mode with noise stimuli''' np.random.seed(0) - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. - NFFT = int(1000 * Fs / 11) + NFFT = int(10 * Fs / 11) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3272,16 +3278,17 @@ def test_specgram_noise_angle(): @image_comparison(baseline_images=['specgram_phase_freqs'], - remove_text=True, extensions=['png']) + remove_text=True, extensions=['png'], + style='default') def test_specgram_freqs_phase(): '''test axes.specgram in phase mode with sinusoidal stimuli''' - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. fstims1 = [Fs/4, Fs/5, Fs/11] fstims2 = [Fs/4.7, Fs/5.6, Fs/11.9] - NFFT = int(1000 * Fs / min(fstims1 + fstims2)) + NFFT = int(10 * Fs / min(fstims1 + fstims2)) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) @@ -3327,15 +3334,16 @@ def test_specgram_freqs_phase(): @image_comparison(baseline_images=['specgram_phase_noise'], - remove_text=True, extensions=['png']) + remove_text=True, extensions=['png'], + style='default') def test_specgram_noise_phase(): '''test axes.specgram in phase mode with noise stimuli''' np.random.seed(0) - n = 10000 - Fs = 100. + n = 1000 + Fs = 10. - NFFT = int(1000 * Fs / 11) + NFFT = int(10 * Fs / 11) noverlap = int(NFFT / 2) pad_to = int(2 ** np.ceil(np.log2(NFFT))) diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png index e1a87370ff93..f083d81a31a1 100644 Binary files a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png and b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid/imagegrid_cbar_mode.png differ diff --git a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_locator.png b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_locator.png index 954394af005b..c7ad1e64b84d 100644 Binary files a/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_locator.png and b/lib/mpl_toolkits/tests/baseline_images/test_axes_grid1/inset_locator.png differ