Commit6847119

authored

Merge pull request#8850 from tacaswell/pdf_color_none

Pdf color none

2 parents4ec14fb +51f0705 commit6847119Copy full SHA for 6847119

File tree

+24

-2

lines changed

+24

-2

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1626,6 +1626,13 @@ def check_gc(self, gc, fillcolor=None):`
`1626`	`1626`
`1627`	`1627`	`orig_alphas=getattr(gc,'_effective_alphas', (1.0,1.0))`
`1628`	`1628`
	`1629`	`+ifgc.get_rgb()isNone:`
	`1630`	`+# it should not matter what color here`
	`1631`	`+# since linewidth should be 0`
	`1632`	`+# unless affected by global settings in rcParams`
	`1633`	`+# hence setting zero alpha just incase`
	`1634`	`+gc.set_foreground((0,0,0,0),isRGBA=True)`
	`1635`	`+`
`1629`	`1636`	`ifgc._forced_alpha:`
`1630`	`1637`	`gc._effective_alphas= (gc._alpha,gc._alpha)`
`1631`	`1638`	`eliffillcolorisNoneorlen(fillcolor)<4:`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -355,8 +355,8 @@ def crop_to_same(actual_path, actual_image, expected_path, expected_image):`
`355`	`355`	`# clip the images to the same size -- this is useful only when`
`356`	`356`	`# comparing eps to pdf`
`357`	`357`	`ifactual_path[-7:-4]=='eps'andexpected_path[-7:-4]=='pdf':`
`358`		`-aw,ah=actual_image.shape`
`359`		`-ew,eh=expected_image.shape`
	`358`	`+aw,ah,ad=actual_image.shape`
	`359`	`+ew,eh,ed=expected_image.shape`
`360`	`360`	`actual_image=actual_image[int(aw/2-ew/2):int(`
`361`	`361`	`aw/2+ew/2),int(ah/2-eh/2):int(ah/2+eh/2)]`
`362`	`362`	`returnactual_image,expected_image`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@`
`19`	`19`	`_determinism_check)`
`20`	`20`	`frommatplotlib.testing.decoratorsimportimage_comparison`
`21`	`21`	`frommatplotlibimportdviread`
	`22`	`+frommatplotlib.testing.compareimportcompare_images`
`22`	`23`
	`24`	`+importmatplotlibasmpl`
`23`	`25`
`24`	`26`	`needs_usetex=pytest.mark.xfail(`
`25`	`27`	`notcheckdep_usetex(True),`
`@@ -193,3 +195,16 @@ def psfont(args, *kwargs):`
`193`	`195`	`ax.text(0.5,0.5,'hello')`
`194`	`196`	`withtempfile.TemporaryFile()astmpfile,pytest.raises(ValueError):`
`195`	`197`	`fig.savefig(tmpfile,format='pdf')`
	`198`	`+`
	`199`	`+`
	`200`	`+@pytest.mark.style('default')`
	`201`	`+deftest_pdf_savefig_when_color_is_none(tmpdir):`
	`202`	`+fig,ax=plt.subplots()`
	`203`	`+plt.axis('off')`
	`204`	`+ax.plot(np.sin(np.linspace(-5,5,100)),'v',c='none')`
	`205`	`+actual_image=tmpdir.join('figure.pdf')`
	`206`	`+expected_image=tmpdir.join('figure.eps')`
	`207`	`+fig.savefig(str(actual_image),format='pdf')`
	`208`	`+fig.savefig(str(expected_image),format='eps')`
	`209`	`+result=compare_images(str(actual_image),str(expected_image),0)`
	`210`	`+assertresultisNone`

Comments

(0)