Skip to content

fixed pdf backend saving 2nd go #8674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

fixed pdf backend saving 2nd go #8674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74f8af2
fixed pdf backend saving and modified pdf to eps blank/nonblank compa…
May 27, 2017
8046c04
Update backend_pdf.py
May 28, 2017
cbed449
Update backend_pdf.py
May 28, 2017
36a0a76
fixed up test case
Jun 2, 2017
8bfd788
Update test_backend_pdf.py
Jun 2, 2017
7b65694
Update test_backend_pdf.py
Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/matplotlib/backends/backend_pdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,13 @@ def check_gc(self, gc, fillcolor=None):

orig_alphas = getattr(gc, '_effective_alphas', (1.0, 1.0))

if gc._rgb is None:
# it should not matter what color here
# since linewidth should be 0
# unless affected by global settings in rcParams
# hence setting zero alpha just incase
gc._rgb = [0, 0, 0, 0]

if gc._forced_alpha:
gc._effective_alphas = (gc._alpha, gc._alpha)
elif fillcolor is None or len(fillcolor) < 4:
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/testing/compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@ def crop_to_same(actual_path, actual_image, expected_path, expected_image):
# clip the images to the same size -- this is useful only when
# comparing eps to pdf
if actual_path[-7:-4] == 'eps' and expected_path[-7:-4] == 'pdf':
aw, ah = actual_image.shape
ew, eh = expected_image.shape
aw, ah, ad = actual_image.shape
ew, eh, ed = expected_image.shape
actual_image = actual_image[int(aw / 2 - ew / 2):int(
aw / 2 + ew / 2), int(ah / 2 - eh / 2):int(ah / 2 + eh / 2)]
return actual_image, expected_image
Expand Down
17 changes: 17 additions & 0 deletions lib/matplotlib/tests/test_backend_pdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
_determinism_check)
from matplotlib.testing.decorators import image_comparison
from matplotlib import dviread
from matplotlib.testing.compare import compare_images

import matplotlib as mpl

needs_tex = pytest.mark.xfail(
not checkdep_tex(),
Expand Down Expand Up @@ -191,3 +193,18 @@ def psfont(*args, **kwargs):
ax.text(0.5, 0.5, 'hello')
with tempfile.TemporaryFile() as tmpfile, pytest.raises(ValueError):
fig.savefig(tmpfile, format='pdf')


@pytest.fixture(scope='function')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to make this a new fixture? The coverage is failing because this is never getting run

def test_pdf_savefig_when_color_is_none(tempdir_factory):
rcParams['_internal.classic_mode'] = False
plt.subplot()
plt.axis('off')
plt.plot(np.sin(np.linspace(-5, 5, 100)), 'v', c='none')
tmpdir_name = str(np.random.randint(100000, 10000000))
actual_image = tempdir_factory.mktemp(tmpdir_name).join('figure.pdf')
expected_image = tempdir_factory.mktemp(tmpdir_name).join('figure.eps')
plt.savefig(str(actual_image), format='pdf')
plt.savefig(str(expected_image), format='eps')
result = compare_images(str(actual_image), str(expected_image), 0)
assert result is None