Skip to content

Commit ffa6224

Browse files
authored
Merge pull request #52 from FoamyGuy/remove_readinot_fallback
remove readinto fallback for 6.2.0-beta4
2 parents 681a604 + 985b0b1 commit ffa6224

File tree

1 file changed

+9
-27
lines changed

1 file changed

+9
-27
lines changed

adafruit_imageload/bmp/indexed.py

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -88,33 +88,15 @@ def load(
8888
if compression == 0:
8989

9090
if _bitmap_readinto:
91-
try:
92-
_bitmap_readinto(
93-
bitmap,
94-
file,
95-
bits_per_pixel=color_depth,
96-
element_size=4,
97-
reverse_pixels_in_element=True,
98-
reverse_rows=True,
99-
)
100-
except TypeError:
101-
# catch unexpected argument, try python read code.
102-
# This issue affects only CircuitPython 6.2.0-beta.4.
103-
# The try/except block here should be removed when
104-
# a newer release is made.
105-
chunk = bytearray(line_size)
106-
for y in range(range1, range2, range3):
107-
file.readinto(chunk)
108-
pixels_per_byte = 8 // color_depth
109-
offset = y * width
110-
111-
for x in range(width):
112-
i = x // pixels_per_byte
113-
pixel = (
114-
chunk[i]
115-
>> (8 - color_depth * (x % pixels_per_byte + 1))
116-
) & mask
117-
bitmap[offset + x] = pixel
91+
_bitmap_readinto(
92+
bitmap,
93+
file,
94+
bits_per_pixel=color_depth,
95+
element_size=4,
96+
reverse_pixels_in_element=True,
97+
reverse_rows=True,
98+
)
99+
118100
else: # use the standard file.readinto
119101
chunk = bytearray(line_size)
120102
for y in range(range1, range2, range3):

0 commit comments

Comments
 (0)