From 985b0b113a98b251919c7dad5d874f285be3cf35 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 12 Jun 2021 10:37:49 -0500 Subject: [PATCH] remove readinto fallback for 6.2.0-beta4 --- adafruit_imageload/bmp/indexed.py | 36 ++++++++----------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/adafruit_imageload/bmp/indexed.py b/adafruit_imageload/bmp/indexed.py index 5c529e4..1fed132 100755 --- a/adafruit_imageload/bmp/indexed.py +++ b/adafruit_imageload/bmp/indexed.py @@ -88,33 +88,15 @@ def load( if compression == 0: if _bitmap_readinto: - try: - _bitmap_readinto( - bitmap, - file, - bits_per_pixel=color_depth, - element_size=4, - reverse_pixels_in_element=True, - reverse_rows=True, - ) - except TypeError: - # catch unexpected argument, try python read code. - # This issue affects only CircuitPython 6.2.0-beta.4. - # The try/except block here should be removed when - # a newer release is made. - chunk = bytearray(line_size) - for y in range(range1, range2, range3): - file.readinto(chunk) - pixels_per_byte = 8 // color_depth - offset = y * width - - for x in range(width): - i = x // pixels_per_byte - pixel = ( - chunk[i] - >> (8 - color_depth * (x % pixels_per_byte + 1)) - ) & mask - bitmap[offset + x] = pixel + _bitmap_readinto( + bitmap, + file, + bits_per_pixel=color_depth, + element_size=4, + reverse_pixels_in_element=True, + reverse_rows=True, + ) + else: # use the standard file.readinto chunk = bytearray(line_size) for y in range(range1, range2, range3):