Attempt memory mapping when tile args is a string#7565
Merged
hugovk merged 1 commit intopython-pillow:mainfrom Dec 21, 2023
Merged
Attempt memory mapping when tile args is a string#7565hugovk merged 1 commit intopython-pillow:mainfrom
hugovk merged 1 commit intopython-pillow:mainfrom
Conversation
fdintino
added a commit
to fdintino/pillow-avif-plugin
that referenced
this pull request
Jan 9, 2024
* fix: Convert EXIF orientation to AVIF irot and imir * Disable mmap (see python-pillow/Pillow#7565) * pin older cmake for python 2.7
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
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.
Here is the logic used to determine whether or not to try memory mapping.
Pillow/src/PIL/ImageFile.py
Lines 187 to 195 in 9694cfc
It is expecting
argsto be a tuple, as in the following.Pillow/src/PIL/SunImagePlugin.py
Line 125 in 9694cfc
However, here are a few place where the
argsfor the "raw" tile is just a string.Pillow/src/PIL/DdsImagePlugin.py
Line 163 in 9694cfc
Pillow/src/PIL/PsdImagePlugin.py
Lines 265 to 268 in 9694cfc
Pillow/src/PIL/WebPImagePlugin.py
Line 55 in 9694cfc
Pillow/src/PIL/WebPImagePlugin.py
Line 167 in 9694cfc
So this PR updates the logic in ImageFile to allow for this possibility as well.
Testing it however, this causes WebPImagePlugin to start failing, so I've added
load_seekto stop it attempting memory mapping.