{{ message }}
-
-
Notifications
You must be signed in to change notification settings - Fork 8.5k
FIX: account for deprecations of constant in Pillow 9.1 #22766
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bb99770
FIX: account for constant deprecations in Pillow 9.1
tacaswell a367714
FIX: leaking temporary files in animation saving
tacaswell e3fea7e
CI: add pip list to azure pipeline
tacaswell f930098
STY: fix whitespace
tacaswell bd6f04b
MNT: shorter version of Pillow API shims
tacaswell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1700,8 +1700,19 @@ def _writeImg(self, data, id, smask=None): | |
| # Convert to indexed color if there are 256 colors or fewer | ||
| # This can significantly reduce the file size | ||
| num_colors = len(img_colors) | ||
| img = img.convert(mode='P', dither=Image.NONE, | ||
| palette=Image.ADAPTIVE, colors=num_colors) | ||
| # These constants were converted to IntEnums and deprecated in | ||
| # Pillow 9.2 | ||
| dither = ( | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know this style is odd, but these names a very long and this code is very indented. I also tried dither = (
Image.Dither.NONE
if hasattr(Image, 'Dither')
else Image.NONE
)and liked that worse. also tried doing this in-line in the function call, but that was also (subjectively) worse to my eye. |
||
| Image.Dither.NONE if hasattr(Image, 'Dither') | ||
| else Image.NONE | ||
| ) | ||
| pmode = ( | ||
| Image.Palette.ADAPTIVE if hasattr(Image, 'Palette') | ||
| else Image.ADAPTIVE | ||
| ) | ||
|
tacaswell marked this conversation as resolved.
Outdated
|
||
| img = img.convert( | ||
| mode='P', dither=dither, palette=pmode, colors=num_colors | ||
| ) | ||
| png_data, bit_depth, palette = self._writePng(img) | ||
| if bit_depth is None or palette is None: | ||
| raise RuntimeError("invalid PNG header") | ||
|
|
||
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.
You can’t perform that action at this time.

Uh oh!
There was an error while loading. Please reload this page.