Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Guard against too-large figures #6666
Conversation
mdboom
added the
needs_review
label
Jun 29, 2016
|
Do we want to keep waiting for the macos test to start? I think this all looks good to me. |
|
@WeatherGod It looks like there is an issue with the OSX travis instances at the moment https://www.traviscistatus.com/ IMHO it's fine to merge this as is
|
WeatherGod
merged commit f6effa8
into matplotlib:master
Jun 29, 2016
mdboom
removed the
needs_review
label
Jun 29, 2016
|
This should backport to v2.x, but what about v1.5.x? |
|
I vote for 1.5.x too since the bug has come up a number of times now on 1.5.1 and we should try to avoid crashing bugs as much as possible. |
|
so, do I cherry-pick to both branches, or just one of them and everything gets merged around later? |
|
Normally 1.5.x will be merged into 2.x which will be merged into master, I guess @tacaswell should have final say on if this goes into 1.5.x since he will have to do the release. |
|
|
|
ok, backporting this to v1.5.x brings up a merge conflict in the tests. Seems like it wants to merge in the AGG filter tests. I left them out (keeping only the test_too_large_image()). How well will that go over for the merge to v2.x? |
|
Those sorts of things tend to go ok. On Wed, Jun 29, 2016 at 12:03 PM Benjamin Root notifications@github.com
|
WeatherGod
added a commit
that referenced
this pull request
Jun 29, 2016
|
|
WeatherGod |
84f3a6f
|
|
forgot to note: backported to v1.5.x via 84f3a6f. I'll leave it as an exercise for the more experienced to handle the merge over to v2.x. |
mdboom
added this to the
1.5.2 (Critical bug fix release)
milestone
Jun 29, 2016
|
I have done the merge to 2.x and master |
mdboom commentedJun 29, 2016
Agg buffers must have a max size of 2^16 pixels in each dimension. This guards against that (and related segfaults from allocating too much memory).
Fixes ipython/ipython#9676