Skip to content

Commit 4aa1c1c

Browse files
authored
Merge pull request #37 from adafruit/default-params
Set bitmap and palette to have default values
2 parents e23dfde + e6ab054 commit 4aa1c1c

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

adafruit_imageload/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,19 @@ def load(filename, *, bitmap=None, palette=None):
4343
palette is the desired pallete type. The constructor should take the number of colors and
4444
support assignment to indices via [].
4545
"""
46+
if not bitmap or not palette:
47+
try:
48+
# use displayio if available
49+
import displayio
50+
51+
if not bitmap:
52+
bitmap = displayio.Bitmap
53+
if not palette:
54+
palette = displayio.Palette
55+
except ModuleNotFoundError:
56+
# meh, we tried
57+
pass
58+
4659
with open(filename, "rb") as file:
4760
header = file.read(3)
4861
file.seek(0)

examples/imageload_simpletest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
import displayio
33
import adafruit_imageload
44

5-
image, palette = adafruit_imageload.load(
6-
"images/4bit.bmp", bitmap=displayio.Bitmap, palette=displayio.Palette
7-
)
5+
image, palette = adafruit_imageload.load("images/4bit.bmp")
6+
87
tile_grid = displayio.TileGrid(image, pixel_shader=palette)
98

109
group = displayio.Group()

0 commit comments

Comments
 (0)