NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commitd388d2f

authored

Merge pull request#10253 from matplotlib/auto-backport-of-pr-10077

Backport PR#10077 on branch v2.1.x

2 parentsd9d5289 +20ac580 commitd388d2fCopy full SHA for d388d2f

File tree

7 files changed

+11

-4

lines changed

extern/agg24-svn/include
- agg_math_stroke.h
lib/matplotlib/tests
- baseline_images
  - test_pickle
    - multi_pickle.png
  - test_streamplot
- test_streamplot.py
- test_triangulation.py

7 files changed

+11

-4

lines changed

`‎extern/agg24-svn/include/agg_math_stroke.h`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,8 @@ namespace agg`
`391`	`391`	`vc.remove_all();`
`392`	`392`
`393`	`393`	`double cp =cross_product(v0.x, v0.y, v1.x, v1.y, v2.x, v2.y);`
`394`		`-if(cp !=0 && (cp >0) == (m_width >0))`
	`394`	`+if ((cp > agg::vertex_dist_epsilon && m_width >0) \|\|`
	`395`	`+ (cp < -agg::vertex_dist_epsilon && m_width <0))`
`395`	`396`	`{`
`396`	`397`	`// Inner join`
`397`	`398`	`//---------------`

`‎lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png`

-4 Bytes

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png`

98 Bytes

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png`

88 Bytes

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png`

89 Bytes

`‎lib/matplotlib/tests/test_streamplot.py`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,18 @@`
`1`	`1`	`from __future__import (absolute_import,division,print_function,`
`2`	`2`	`unicode_literals)`
`3`	`3`
	`4`	`+importsys`
	`5`	`+`
`4`	`6`	`importnumpyasnp`
`5`	`7`	`fromnumpy.testingimportassert_array_almost_equal`
`6`	`8`	`importmatplotlib.pyplotasplt`
`7`	`9`	`frommatplotlib.testing.decoratorsimportimage_comparison`
`8`	`10`	`importmatplotlib.transformsasmtransforms`
`9`	`11`
`10`	`12`
	`13`	`+on_win= (sys.platform=='win32')`
	`14`	`+`
	`15`	`+`
`11`	`16`	`defvelocity_field():`
`12`	`17`	`Y,X=np.mgrid[-3:3:100j,-3:3:100j]`
`13`	`18`	`U=-1-X**2+Y`
`@@ -36,7 +41,7 @@ def test_startpoints():`
`36`	`41`
`37`	`42`
`38`	`43`	`@image_comparison(baseline_images=['streamplot_colormap'],`
`39`		`-tol=0.002)`
	`44`	`+tol=.02)`
`40`	`45`	`deftest_colormap():`
`41`	`46`	`X,Y,U,V=velocity_field()`
`42`	`47`	`plt.streamplot(X,Y,U,V,color=U,density=0.6,linewidth=2,`
`@@ -54,7 +59,8 @@ def test_linewidth():`
`54`	`59`	`linewidth=lw)`
`55`	`60`
`56`	`61`
`57`		`-@image_comparison(baseline_images=['streamplot_masks_and_nans'])`
	`62`	`+@image_comparison(baseline_images=['streamplot_masks_and_nans'],`
	`63`	`+tol=0.04ifon_winelse0)`
`58`	`64`	`deftest_masks_and_nans():`
`59`	`65`	`X,Y,U,V=velocity_field()`
`60`	`66`	`mask=np.zeros(U.shape,dtype=bool)`

`‎lib/matplotlib/tests/test_triangulation.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,7 @@ def z(x, y):`
`785`	`785`
`786`	`786`
`787`	`787`	`@image_comparison(baseline_images=['tri_smooth_gradient'],`
`788`		`-extensions=['png'],remove_text=True,tol=0.035)`
	`788`	`+extensions=['png'],remove_text=True,tol=0.092)`
`789`	`789`	`deftest_tri_smooth_gradient():`
`790`	`790`	`# Image comparison based on example trigradient_demo.`
`791`	`791`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitd388d2f

File tree

7 files changed

7 files changed

`‎extern/agg24-svn/include/agg_math_stroke.h`

`‎lib/matplotlib/tests/baseline_images/test_pickle/multi_pickle.png`

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png`

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth.png`

`‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans.png`

`‎lib/matplotlib/tests/test_streamplot.py`

`‎lib/matplotlib/tests/test_triangulation.py`

0 commit comments