-
Notifications
You must be signed in to change notification settings - Fork 169
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
Add basic support for .heic files #519
Open
ususdei
wants to merge
2
commits into
saimn:main
Choose a base branch
from
ususdei:feat_heif
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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 |
---|---|---|
|
@@ -44,6 +44,11 @@ | |
from pilkit.processors import Transpose | ||
from pilkit.utils import save_image | ||
|
||
try: | ||
from pillow_heif import HeifImagePlugin | ||
except: | ||
pass | ||
|
||
from . import signals, utils | ||
|
||
# Force loading of truncated files | ||
|
@@ -220,7 +225,11 @@ def get_exif_data(filename): | |
|
||
try: | ||
with warnings.catch_warnings(record=True) as caught_warnings: | ||
exif = img._getexif() or {} | ||
exif = {} | ||
if hasattr(img, "_getexif") and callable(img._getexif): | ||
exif = img._getexif() | ||
elif "exif" in img.info: | ||
exif = img.getexif()._get_merged_dict() | ||
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.
|
||
except ZeroDivisionError: | ||
logger.warning("Failed to read EXIF data.") | ||
return None | ||
|
@@ -290,7 +299,7 @@ def get_image_metadata(filename): | |
logger.error("Could not open image %s metadata: %s", filename, e) | ||
else: | ||
try: | ||
if os.path.splitext(filename)[1].lower() in (".jpg", ".jpeg"): | ||
if os.path.splitext(filename)[1].lower() in (".jpg", ".jpeg", ".heic"): | ||
exif = get_exif_data(img) | ||
except Exception as e: | ||
logger.warning("Could not read EXIF data from %s: %s", filename, e) | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The extension list here and below should also include ".heif" I guess ?
Also, those extensions should be recognized only if pillow-heif is available, so might be better to store this list somewhere where it can be imported (in the
image
module ?) and reused.