diff --git a/examples/tests/pngsuite/pngsuite.py b/examples/tests/pngsuite/pngsuite.py deleted file mode 100644 index ca8d162bc265..000000000000 --- a/examples/tests/pngsuite/pngsuite.py +++ /dev/null @@ -1,29 +0,0 @@ -""" -This test loads a subset of the files in Willem van Schaik's PNG test -suite available here: - - http://libpng.org/pub/png/pngsuite.html - -The result should look like truth.png. -""" - -from matplotlib import pyplot as plt -import matplotlib.cm as cm -import glob - -files = glob.glob("basn*.png") -files.sort() - -plt.figure(figsize=(len(files), 2)) - -for i, fname in enumerate(files): - data = plt.imread(fname) - cmap = None # use default colormap - if data.ndim==2: - # keep grayscale images gray - cmap = cm.gray - plt.imshow(data, extent=[i,i+1,0,1], cmap=cmap) - -plt.gca().get_frame().set_facecolor("#ddffff") -plt.gca().set_xlim(0, len(files)) -plt.show() diff --git a/examples/tests/pngsuite/truth.png b/examples/tests/pngsuite/truth.png deleted file mode 100644 index 49610ba02daf..000000000000 Binary files a/examples/tests/pngsuite/truth.png and /dev/null differ diff --git a/examples/tests/pngsuite/basn0g01.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn0g01.png similarity index 100% rename from examples/tests/pngsuite/basn0g01.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn0g01.png diff --git a/examples/tests/pngsuite/basn0g02.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn0g02.png similarity index 100% rename from examples/tests/pngsuite/basn0g02.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn0g02.png diff --git a/examples/tests/pngsuite/basn0g04.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn0g04.png similarity index 100% rename from examples/tests/pngsuite/basn0g04.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn0g04.png diff --git a/examples/tests/pngsuite/basn0g08.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn0g08.png similarity index 100% rename from examples/tests/pngsuite/basn0g08.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn0g08.png diff --git a/examples/tests/pngsuite/basn0g16.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn0g16.png similarity index 100% rename from examples/tests/pngsuite/basn0g16.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn0g16.png diff --git a/examples/tests/pngsuite/basn2c08.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn2c08.png similarity index 100% rename from examples/tests/pngsuite/basn2c08.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn2c08.png diff --git a/examples/tests/pngsuite/basn2c16.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn2c16.png similarity index 100% rename from examples/tests/pngsuite/basn2c16.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn2c16.png diff --git a/examples/tests/pngsuite/basn3p01.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn3p01.png similarity index 100% rename from examples/tests/pngsuite/basn3p01.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn3p01.png diff --git a/examples/tests/pngsuite/basn3p02.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn3p02.png similarity index 100% rename from examples/tests/pngsuite/basn3p02.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn3p02.png diff --git a/examples/tests/pngsuite/basn3p04.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn3p04.png similarity index 100% rename from examples/tests/pngsuite/basn3p04.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn3p04.png diff --git a/examples/tests/pngsuite/basn3p08.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn3p08.png similarity index 100% rename from examples/tests/pngsuite/basn3p08.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn3p08.png diff --git a/examples/tests/pngsuite/basn4a08.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn4a08.png similarity index 100% rename from examples/tests/pngsuite/basn4a08.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn4a08.png diff --git a/examples/tests/pngsuite/basn4a16.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn4a16.png similarity index 100% rename from examples/tests/pngsuite/basn4a16.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn4a16.png diff --git a/examples/tests/pngsuite/basn6a08.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn6a08.png similarity index 100% rename from examples/tests/pngsuite/basn6a08.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn6a08.png diff --git a/examples/tests/pngsuite/basn6a16.png b/lib/matplotlib/tests/baseline_images/pngsuite/basn6a16.png similarity index 100% rename from examples/tests/pngsuite/basn6a16.png rename to lib/matplotlib/tests/baseline_images/pngsuite/basn6a16.png diff --git a/lib/matplotlib/tests/baseline_images/test_png/pngsuite.pdf b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.pdf new file mode 100644 index 000000000000..11355aa62bd8 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.pdf differ diff --git a/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png new file mode 100644 index 000000000000..5c3dced973c7 Binary files /dev/null and b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.png differ diff --git a/lib/matplotlib/tests/baseline_images/test_png/pngsuite.svg b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.svg new file mode 100644 index 000000000000..8317c4efd22b --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_png/pngsuite.svg @@ -0,0 +1,638 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/test_png.py b/lib/matplotlib/tests/test_png.py new file mode 100644 index 000000000000..58213c4aeb28 --- /dev/null +++ b/lib/matplotlib/tests/test_png.py @@ -0,0 +1,29 @@ +from matplotlib.testing.decorators import image_comparison, knownfailureif +from matplotlib import pyplot as plt +import matplotlib.cm as cm +import glob +import os + +@image_comparison(baseline_images=['pngsuite']) +def test_pngsuite(): + dirname = os.path.join( + os.path.dirname(__file__), + 'baseline_images', + 'pngsuite') + files = glob.glob(os.path.join(dirname, 'basn*.png')) + files.sort() + + fig = plt.figure(figsize=(len(files), 2)) + + for i, fname in enumerate(files): + data = plt.imread(fname) + cmap = None # use default colormap + if data.ndim==2: + # keep grayscale images gray + cmap = cm.gray + plt.imshow(data, extent=[i,i+1,0,1], cmap=cmap) + + plt.gca().get_frame().set_facecolor("#ddffff") + plt.gca().set_xlim(0, len(files)) + + fig.savefig('pngsuite')