Added JPG support #81
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
Add support for JPG files using a wrapper that implements the jpegio library.
Added a JPG module that calls jpegio and updated the base __init__.py to recognize JPG files.
Removed the palette option from the load function since it isnt used, as we use colorconverter instead.
Completed the simpletest example script, along with a provided jpg.
Disabled the too-many-branches pylint check in __init__.py The new 'if' statement goes over the limit of 12 branches. Shortened comment in jpg.py
Pictures of cats are always welcome. Thanks! |
tannewt
reviewed
Jul 24, 2024
There was a problem hiding this comment.
Great idea! This is helpful. I bet you need to setup pre-commit locally: https://learn.adafruit.com/improve-your-code-with-pylint/check-your-code-with-pre-commit
Formatting errors in jpg.py should be corrected now. PyCharm was using CRLF instead of LF line separators.
|
Sorry for that, pre-commit was choking on me. I have Python 3.12 installed and pre-commit was choking because I am on Python 3.12. I wound up setting up PyCharm to run pylint and black for me. |
Helps if I include them all.
tannewt
approved these changes
Jul 26, 2024
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Jul 28, 2024
Updating https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad to 1.21.0 from 1.20.2: > Merge pull request adafruit/Adafruit_CircuitPython_ImageLoad#81 from ch4nsuk3/jpg-support Updating https://github.com/adafruit/Adafruit_CircuitPython_Bundle/circuitpython_library_list.md to NA from NA: > Updated download stats for the libraries
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.
Fixes #79
Adds JPG support via calls to the jpegio library, allowing use of consistent code without having to switch back and forth between the two libraries directly. This is the easiest way to do it, as trying to create a JPG decoder in python is never going to be as efficient as jpegio as it and the library it relies upon, tjpgd, are coded in C and are well optimized. Progressive JPG images are not supported.
I originally was going to implement a check for the flags which indicate what encoding method is used by scanning the header data, as other classes in this library do, in order to allow for raising an error without having to call jpegio at all. However these flags come after exif data, which can run quite long. This means it could potentially require quite a bit of chewing through a file to get to the needed flags, something jpegio will do much quicker.
I intentionally kept the arguments provided to
jpegio.decodeminimal. The extra arguments are primarily for blit operations and anyone needing those options is likely better served by using jpegio directly.The load function returns a Bitmap and ColorConverter
Changes to the init file are to check for the flags indicating a JPG image, then calling for the load function if so.
I have also included a simpletest showcasing usage. I have provided a sample image as well, a 48x48px image of my cat, done in a posterized style, along with a license document using the MIT license. I understand if you would prefer to use a different image as the test image.