Rewrite the tk C blitting code #10680
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
QuLogic
reviewed
Mar 5, 2018
src/_tkagg.cpp
Outdated
| int height, width; | ||
| unsigned char *data_ptr; | ||
| int x1, x2, y1, y2; | ||
| if (!PyArg_ParseTuple(args, "O(iin)(iiii)", |
src/_tkagg.cpp
Outdated
| } | ||
| PyObject *py_photo_name; | ||
| char const *photo_name; | ||
| Tk_PhotoHandle photo; |
There was a problem hiding this comment.
and these too?
(edit: oops, should go below the next)
src/_tkagg.cpp
Outdated
| &x1, &x2, &y1, &y2)) { | ||
| goto exit; | ||
| } | ||
| PyObject *py_tk, *py_interpaddr; |
There was a problem hiding this comment.
Probably should all have defaults?
|
all comments handled |
QuLogic
reviewed
Mar 5, 2018
src/_tkagg.cpp
Outdated
| block.height = y2 - y1; | ||
| block.pitch = 4 * width; | ||
| block.pixelSize = 4; | ||
| block.offset[0] = 0; |
There was a problem hiding this comment.
Can you use this to avoid the buf.take copy?
|
@mattip Can you verify that this still works with pypy? |
tacaswell
approved these changes
Apr 1, 2018
|
Moved some more work to Python's side, avoiding any need for refcounting at all in the C extension. |
|
works fine on PyPy just like before the PR (with the nightly builds, not the latest release) Thanks for pinging me |
QuLogic
approved these changes
Apr 2, 2018
src/_tkagg.cpp
Outdated
| @@ -203,9 +203,49 @@ static PyObject *_tkinit(PyObject *self, PyObject *args) | |||
| return Py_None; | |||
| } | |||
|
|
|||
| static PyObject *mpl_tk_blit(PyObject *self, PyObject *args) { | |||
There was a problem hiding this comment.
Opening function braces go on a new line.
|
@mattip 2.2.2 does not work on pypy? |
... to use the standard Python C-API rather than the tk API. We do not need to support colormodes other than 2 (i.e. RGBA) (previously there was 0 = grayscale, 1 = RGB) so it was simpler to just deprecate the previous function and move everything to a new private one (matplotlib.backends._backend_tk.blit).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... to use the standard Python C-API rather than the tk API.
We do not need to support colormodes other than 2 (i.e. RGBA)
(previously there was 0 = grayscale, 1 = RGB) so it was simpler to just
deprecate the previous function and move everything to a new private one
(matplotlib.backends._backend_tk.blit).
Followup to #10486 (comment).
PR Summary
PR Checklist