Skip to content

Commit dbb20f5

Browse files
committed
Removed palette option from load function
Removed the palette option from the load function since it isnt used, as we use colorconverter instead.
1 parent 0e2c512 commit dbb20f5

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

adafruit_imageload/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def load(
6868
with open_file as file:
6969
header = file.read(3)
7070
file.seek(0)
71-
print(header)
7271
if header.startswith(b"BM"):
7372
from . import bmp
7473

@@ -93,5 +92,5 @@ def load(
9392
if header.startswith(b"\xff\xd8"):
9493
from . import jpg
9594

96-
return jpg.load(file, bitmap=bitmap, palette=palette)
95+
return jpg.load(file, bitmap=bitmap)
9796
raise RuntimeError("Unsupported image format")

adafruit_imageload/jpg.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
`adafruit_imageload.jpg`
77
====================================================
88
9-
Load a JPG into a bitmap by calling jpegio.
9+
Load a JPG into a bitmap by calling the jpegio class.
1010
1111
* Author(s): Channing Ramos
1212
@@ -21,21 +21,34 @@
2121

2222
try:
2323
from io import BufferedReader
24-
from typing import Tuple, Iterator, Optional, List
25-
from .displayio_types import PaletteConstructor, BitmapConstructor
24+
from typing import Tuple, Optional
25+
from .displayio_types import BitmapConstructor
2626
except ImportError:
2727
pass
2828

2929
from displayio import Bitmap, ColorConverter, Colorspace
3030

31+
__version__ = "0.0.0+auto.0"
32+
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git"
33+
3134
def load(file: BufferedReader,
3235
*,
3336
bitmap: BitmapConstructor,
34-
palette: Optional[PaletteConstructor] = None) -> Tuple[Bitmap, Optional[ColorConverter]]:
35-
37+
) -> Tuple[Bitmap, Optional[ColorConverter]]:
38+
"""
39+
Loads a JPG image from the open ''file''.
40+
The JPG must be a Baseline JPG, Progressive and Lossless JPG formats are not supported.
41+
42+
Returns tuple of bitmap object and ColorConverter object.
43+
44+
:param io.BufferedReader file: Open file handle or compatible (like 'io.BytesIO')
45+
:param object bitmap: Type to store bitmap data.
46+
Must have API similar to 'displayio.Bitmap'. Will be skipped if None.
47+
Will be skipped if None.
48+
"""
3649
decoder = JpegDecoder()
3750
width, height = decoder.open(file)
3851
bitmap_obj = bitmap(width, height, 65535)
3952
decoder.decode(bitmap_obj)
4053

41-
return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED)
54+
return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED)

0 commit comments

Comments
 (0)