From 30f3e71827c6e14b4cf3fa2a59b3f1301e74a528 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Fri, 19 Jul 2024 15:13:42 -0500 Subject: [PATCH 01/59] Initial Commit Add support for JPG files using a wrapper that implements the jpegio library. --- adafruit_imageload/jpg.py | 0 examples/imageload_jpg_simpletest.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 adafruit_imageload/jpg.py create mode 100644 examples/imageload_jpg_simpletest.py diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py new file mode 100644 index 0000000..e69de29 diff --git a/examples/imageload_jpg_simpletest.py b/examples/imageload_jpg_simpletest.py new file mode 100644 index 0000000..e69de29 From 0e2c51241ac55a8bcfe091b46ac2011c631f2d04 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Mon, 22 Jul 2024 12:28:53 -0500 Subject: [PATCH 02/59] JPG Reading Implemented Added a JPG module that calls jpegio and updated the base __init__.py to recognize JPG files. --- adafruit_imageload/__init__.py | 5 +++++ adafruit_imageload/jpg.py | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index bd8cd98..38524e3 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -68,6 +68,7 @@ def load( with open_file as file: header = file.read(3) file.seek(0) + print(header) if header.startswith(b"BM"): from . import bmp @@ -89,4 +90,8 @@ def load( from . import png return png.load(file, bitmap=bitmap, palette=palette) + if header.startswith(b"\xff\xd8"): + from . import jpg + + return jpg.load(file, bitmap=bitmap, palette=palette) raise RuntimeError("Unsupported image format") diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py index e69de29..e2ae895 100644 --- a/adafruit_imageload/jpg.py +++ b/adafruit_imageload/jpg.py @@ -0,0 +1,41 @@ +# SPDX-FileCopyrightText: 2024 Channing Ramos +# +# SPDX-License-Identifier: MIT + +""" +`adafruit_imageload.jpg` +==================================================== + +Load a JPG into a bitmap by calling jpegio. + +* Author(s): Channing Ramos + +""" + +#A separate try for jpegio. While it has wide support it is not universal, and this import may fail. +#If that happens an ImportError with a proper message needs to be raised +try: + from jpegio import JpegDecoder +except ImportError: + print("jpegio not supported on this board.") + +try: + from io import BufferedReader + from typing import Tuple, Iterator, Optional, List + from .displayio_types import PaletteConstructor, BitmapConstructor +except ImportError: + pass + +from displayio import Bitmap, ColorConverter, Colorspace + +def load(file: BufferedReader, + *, + bitmap: BitmapConstructor, + palette: Optional[PaletteConstructor] = None) -> Tuple[Bitmap, Optional[ColorConverter]]: + + decoder = JpegDecoder() + width, height = decoder.open(file) + bitmap_obj = bitmap(width, height, 65535) + decoder.decode(bitmap_obj) + + return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED) \ No newline at end of file From dbb20f58fddc696959497825a01ac27c48174477 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Mon, 22 Jul 2024 16:04:40 -0500 Subject: [PATCH 03/59] Removed palette option from load function Removed the palette option from the load function since it isnt used, as we use colorconverter instead. --- adafruit_imageload/__init__.py | 3 +-- adafruit_imageload/jpg.py | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index 38524e3..0a54f68 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -68,7 +68,6 @@ def load( with open_file as file: header = file.read(3) file.seek(0) - print(header) if header.startswith(b"BM"): from . import bmp @@ -93,5 +92,5 @@ def load( if header.startswith(b"\xff\xd8"): from . import jpg - return jpg.load(file, bitmap=bitmap, palette=palette) + return jpg.load(file, bitmap=bitmap) raise RuntimeError("Unsupported image format") diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py index e2ae895..4570ee9 100644 --- a/adafruit_imageload/jpg.py +++ b/adafruit_imageload/jpg.py @@ -6,7 +6,7 @@ `adafruit_imageload.jpg` ==================================================== -Load a JPG into a bitmap by calling jpegio. +Load a JPG into a bitmap by calling the jpegio class. * Author(s): Channing Ramos @@ -21,21 +21,34 @@ try: from io import BufferedReader - from typing import Tuple, Iterator, Optional, List - from .displayio_types import PaletteConstructor, BitmapConstructor + from typing import Tuple, Optional + from .displayio_types import BitmapConstructor except ImportError: pass from displayio import Bitmap, ColorConverter, Colorspace +__version__ = "0.0.0+auto.0" +__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" + def load(file: BufferedReader, *, bitmap: BitmapConstructor, - palette: Optional[PaletteConstructor] = None) -> Tuple[Bitmap, Optional[ColorConverter]]: - + ) -> Tuple[Bitmap, Optional[ColorConverter]]: + """ + Loads a JPG image from the open ''file''. + The JPG must be a Baseline JPG, Progressive and Lossless JPG formats are not supported. + + Returns tuple of bitmap object and ColorConverter object. + + :param io.BufferedReader file: Open file handle or compatible (like 'io.BytesIO') + :param object bitmap: Type to store bitmap data. + Must have API similar to 'displayio.Bitmap'. Will be skipped if None. + Will be skipped if None. + """ decoder = JpegDecoder() width, height = decoder.open(file) bitmap_obj = bitmap(width, height, 65535) decoder.decode(bitmap_obj) - return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED) \ No newline at end of file + return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565_SWAPPED) From 41a28c13676595879326e3e6e185215ff76d8ecf Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Mon, 22 Jul 2024 16:32:07 -0500 Subject: [PATCH 04/59] Simpletest completed. Completed the simpletest example script, along with a provided jpg. --- examples/imageload_jpg_simpletest.py | 18 ++++++++++++++++++ examples/images/jpg_test.jpg | Bin 0 -> 5465 bytes examples/images/jpg_test.jpg.license | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 examples/images/jpg_test.jpg create mode 100644 examples/images/jpg_test.jpg.license diff --git a/examples/imageload_jpg_simpletest.py b/examples/imageload_jpg_simpletest.py index e69de29..22d5e05 100644 --- a/examples/imageload_jpg_simpletest.py +++ b/examples/imageload_jpg_simpletest.py @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: 2024 Channing Ramos +# +# SPDX-License-Identifier: MIT + +import board +import displayio +import adafruit_imageload + +group = displayio.Group() +board.DISPLAY.root_group = group + +image, color_converter = adafruit_imageload.load("images/jpg_test.jpg") + +tile_grid = displayio.TileGrid(image, pixel_shader=color_converter) +group.append(tile_grid) + +while True: + pass diff --git a/examples/images/jpg_test.jpg b/examples/images/jpg_test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..7479826e16a4c5440dedc123f0fecf48f4d4e8a5 GIT binary patch literal 5465 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 literal 0 HcmV?d00001 diff --git a/examples/images/jpg_test.jpg.license b/examples/images/jpg_test.jpg.license new file mode 100644 index 0000000..ea30990 --- /dev/null +++ b/examples/images/jpg_test.jpg.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Channing Ramos +# SPDX-License-Identifier: MIT \ No newline at end of file From 72e7ae25afa91af9c78f4c3b8f814b1bee9ea043 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 <134003603+ch4nsuk3@users.noreply.github.com> Date: Tue, 23 Jul 2024 17:19:14 -0500 Subject: [PATCH 05/59] Corrected Actions Errors 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 --- adafruit_imageload/__init__.py | 1 + adafruit_imageload/jpg.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index 0a54f68..3f632a6 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -47,6 +47,7 @@ def load( palette is the desired palette type. The constructor should take the number of colors and support assignment to indices via []. """ + # pylint: disable=too-many-branches if not bitmap or not palette: try: # use displayio if available diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py index 4570ee9..3101b37 100644 --- a/adafruit_imageload/jpg.py +++ b/adafruit_imageload/jpg.py @@ -12,7 +12,7 @@ """ -#A separate try for jpegio. While it has wide support it is not universal, and this import may fail. +#A separate try for jpegio. Not every board supports it and this import may fail. #If that happens an ImportError with a proper message needs to be raised try: from jpegio import JpegDecoder From 63779103dcaa661c6be7748a98e795b0d7f245ac Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Thu, 25 Jul 2024 14:23:28 -0500 Subject: [PATCH 06/59] Re-ran Black locally Formatting errors in jpg.py should be corrected now. PyCharm was using CRLF instead of LF line separators. --- adafruit_imageload/jpg.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py index 3101b37..9af3d60 100644 --- a/adafruit_imageload/jpg.py +++ b/adafruit_imageload/jpg.py @@ -12,8 +12,8 @@ """ -#A separate try for jpegio. Not every board supports it and this import may fail. -#If that happens an ImportError with a proper message needs to be raised +# A separate try for jpegio. Not every board supports it and this import may fail. +# If that happens an ImportError with a proper message needs to be raised try: from jpegio import JpegDecoder except ImportError: @@ -31,10 +31,12 @@ __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" -def load(file: BufferedReader, - *, - bitmap: BitmapConstructor, - ) -> Tuple[Bitmap, Optional[ColorConverter]]: + +def load( + file: BufferedReader, + *, + bitmap: BitmapConstructor, +) -> Tuple[Bitmap, Optional[ColorConverter]]: """ Loads a JPG image from the open ''file''. The JPG must be a Baseline JPG, Progressive and Lossless JPG formats are not supported. From 9b9cbf41fda9e23caa5542b3f2c9ad8782ece871 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Thu, 25 Jul 2024 14:34:26 -0500 Subject: [PATCH 07/59] Missed Files Helps if I include them all. --- examples/imageload_jpg_simpletest.py | 4 ++++ examples/images/jpg_test.jpg.license | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/imageload_jpg_simpletest.py b/examples/imageload_jpg_simpletest.py index 22d5e05..dc4b8ef 100644 --- a/examples/imageload_jpg_simpletest.py +++ b/examples/imageload_jpg_simpletest.py @@ -2,6 +2,10 @@ # # SPDX-License-Identifier: MIT +""" +Basic JPG imageload example +""" + import board import displayio import adafruit_imageload diff --git a/examples/images/jpg_test.jpg.license b/examples/images/jpg_test.jpg.license index ea30990..d2f8702 100644 --- a/examples/images/jpg_test.jpg.license +++ b/examples/images/jpg_test.jpg.license @@ -1,2 +1,2 @@ # SPDX-FileCopyrightText: 2024 Channing Ramos -# SPDX-License-Identifier: MIT \ No newline at end of file +# SPDX-License-Identifier: MIT From 3a6248361216294cc2a3492f2455ab6bcf1af96c Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Fri, 26 Jul 2024 18:19:56 -0500 Subject: [PATCH 08/59] Initial Testing Initial testing of the transparency block. --- adafruit_imageload/png.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 34b32f0..93d0e21 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -61,6 +61,10 @@ def load( height = 0 while True: size, chunk = struct.unpack(">I4s", file.read(8)) + print("==================") + print(size) + print(chunk) + print('====================') if chunk == b"IHDR": ( width, @@ -86,6 +90,9 @@ def load( pal = palette(pal_size) for i in range(pal_size): pal[i] = file.read(3) + elif chunk == b"tRNS": + transparent = file.read(size) + print(transparent) elif chunk == b"IDAT": data.extend(file.read(size)) elif chunk == b"IEND": From 0aed0e9c1ccd84085e3f6fa545ad82112064dd52 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 <134003603+ch4nsuk3@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:02:30 -0500 Subject: [PATCH 09/59] Initial Implementation Transparency checking works, but there still may be efficient methods. --- adafruit_imageload/png.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 93d0e21..130579c 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -61,10 +61,6 @@ def load( height = 0 while True: size, chunk = struct.unpack(">I4s", file.read(8)) - print("==================") - print(size) - print(chunk) - print('====================') if chunk == b"IHDR": ( width, @@ -91,8 +87,10 @@ def load( for i in range(pal_size): pal[i] = file.read(3) elif chunk == b"tRNS": - transparent = file.read(size) - print(transparent) + trns_list = list(file.read(size)) + indices = [i for i, x in enumerate(trns_list) if x == 0] + for index in indices: + pal.make_transparent(index) elif chunk == b"IDAT": data.extend(file.read(size)) elif chunk == b"IEND": From ce523ff41fe4446f0d2926815a55391b2c424570 Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Thu, 1 Aug 2024 15:41:56 -0500 Subject: [PATCH 10/59] Final Implementation Various testing shows using a for loop is the quickest method, beating enumeration and list comprehension. --- adafruit_imageload/png.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 130579c..8e0d481 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -48,7 +48,7 @@ def load( :param object palette: Type to store the palette. Must have API similar to `displayio.Palette`. Will be skipped if None. """ - # pylint: disable=too-many-locals,too-many-branches + # pylint: disable=too-many-locals,too-many-branches, consider-using-enumerate, too-many-statements header = file.read(8) if header != b"\x89PNG\r\n\x1a\n": raise ValueError("Not a PNG file") @@ -87,10 +87,12 @@ def load( for i in range(pal_size): pal[i] = file.read(3) elif chunk == b"tRNS": - trns_list = list(file.read(size)) - indices = [i for i, x in enumerate(trns_list) if x == 0] - for index in indices: - pal.make_transparent(index) + if size > len(pal): + raise ValueError("More transparency entries than palette entries") + trns_data = file.read(size) + for i in range(len(trns_data)): + if trns_data[i] == 0: + pal.make_transparent(i) elif chunk == b"IDAT": data.extend(file.read(size)) elif chunk == b"IEND": From a8809b03a6f40a2f96402d5ec9d864edddc5f27e Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Thu, 1 Aug 2024 15:44:40 -0500 Subject: [PATCH 11/59] Updated author info --- adafruit_imageload/png.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 8e0d481..870313c 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -1,5 +1,6 @@ # SPDX-FileCopyrightText: 2022 Radomir Dopieralski # SPDX-FileCopyrightText: 2023 Matt Land +# SPDX-FileCopyrightText: 2024 Channing Ramos # # SPDX-License-Identifier: MIT @@ -10,7 +11,7 @@ Load pixel values (indices or colors) into a bitmap and colors into a palette from a PNG file. -* Author(s): Radomir Dopieralski, Matt Land +* Author(s): Radomir Dopieralski, Matt Land, Channing Ramos """ From a7ac0db3a7f5c39808718afe165b7a2f1a985dbb Mon Sep 17 00:00:00 2001 From: ch4nsuk3 Date: Fri, 2 Aug 2024 16:24:59 -0500 Subject: [PATCH 12/59] Del trans_data Deletes the trans_data list after its no longer needed. --- adafruit_imageload/png.py | 1 + 1 file changed, 1 insertion(+) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 870313c..dbc0abf 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -94,6 +94,7 @@ def load( for i in range(len(trns_data)): if trns_data[i] == 0: pal.make_transparent(i) + del trns_data elif chunk == b"IDAT": data.extend(file.read(size)) elif chunk == b"IEND": From 8e6af9bdd08a317978e4a2aa7881459e1b2ff050 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Sat, 3 Aug 2024 02:38:56 +0200 Subject: [PATCH 13/59] Add support for RGB, RGBA and Grayscale PNGs This adds support for filters, which lets us decode grayscale and RGB images. I only support 8bit depth for now (and 24bit for RGB) but with better color conversion code, other depths could be supported. --- adafruit_imageload/png.py | 83 ++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 9 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index dbc0abf..2c302f1 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -49,7 +49,7 @@ def load( :param object palette: Type to store the palette. Must have API similar to `displayio.Palette`. Will be skipped if None. """ - # pylint: disable=too-many-locals,too-many-branches, consider-using-enumerate, too-many-statements + # pylint: disable=too-many-locals, too-many-branches, consider-using-enumerate, too-many-statements, import-outside-toplevel, invalid-name header = file.read(8) if header != b"\x89PNG\r\n\x1a\n": raise ValueError("Not a PNG file") @@ -103,15 +103,80 @@ def load( file.seek(size, 1) # skip unknown chunks file.seek(4, 1) # skip CRC data_bytes = zlib.decompress(data) - bmp = bitmap(width, height, 1 << depth) - scanline = (width * depth + 7) // 8 - mem = memoryview(bmp) + unit = (1, 0, 3, 1, 2, 0, 4)[mode] + scanline = (width * depth * unit + 7) // 8 + colors = 1 << (depth * unit) + if mode == 3: # indexed + bmp = bitmap(width, height, colors) + mem = memoryview(bmp) + for y in range(height): + dst = y * scanline + src = y * (scanline + 1) + 1 + mem[dst : dst + scanline] = data_bytes[src : src + scanline] + return bmp, pal + # RGB, RGBA or Grayscale + import displayio + + if depth != 8: + raise ValueError("Must be 8bit depth.") + pal = displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB888) + bmp = bitmap(width, height, 65536) + prev = bytearray(scanline) + line = bytearray(scanline) for y in range(height): - dst = y * scanline - src = y * (scanline + 1) + 1 - filter_ = data_bytes[src - 1] + src = y * (scanline + 1) + filter_ = data_bytes[src] + src += 1 if filter_ == 0: - mem[dst : dst + scanline] = data_bytes[src : src + scanline] + line[0:scanline] = data_bytes[src : src + scanline] + elif filter_ == 1: # sub + for i in range(scanline): + a = line[i - unit] if i >= unit else 0 + line[i] = (data_bytes[src] + a) & 0xFF + src += 1 + elif filter_ == 2: # up + for i in range(scanline): + b = prev[i] + line[i] = (data_bytes[src] + b) & 0xFF + src += 1 + elif filter_ == 3: # average + for i in range(scanline): + a = line[i - unit] if i >= unit else 0 + b = prev[i] + line[i] = (data_bytes[src] + ((a + b) >> 1)) & 0xFF + src += 1 + elif filter_ == 4: # paeth + for i in range(scanline): + a = line[i - unit] if i >= unit else 0 + b = prev[i] + c = prev[i - unit] if i >= unit else 0 + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + p = a + elif pb <= pc: + p = b + else: + p = c + line[i] = (data_bytes[src] + p) & 0xFF + src += 1 + else: + raise ValueError("Wrong filter.") + prev, line = line, prev + if mode in (0, 4): # grayscale + for x in range(width): + c = line[x * unit] + bmp[x, y] = pal.convert((c << 16) | (c << 8) | c) + elif mode in {2, 6}: # rgb + for x in range(width): + bmp[x, y] = pal.convert( + (line[x * unit + 0] << 16) + | (line[x * unit + 1] << 8) + | line[x * unit + 2] + ) else: - raise NotImplementedError("Filters not supported") + raise ValueError("Unsupported color mode.") + pal = displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565) return bmp, pal From 349529978c607bc4added21642594a98d96babe6 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Sat, 3 Aug 2024 16:35:02 +0200 Subject: [PATCH 14/59] Fix #74 Add a workaround for bug https://github.com/adafruit/circuitpython/issues/6675 and use bitmap[x, y] instead of putting data into the bitmap directly through the memoryview for bit depths < 8. --- adafruit_imageload/png.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 2c302f1..404d503 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -112,7 +112,19 @@ def load( for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - mem[dst : dst + scanline] = data_bytes[src : src + scanline] + if depth < 8: + # Work around the bug in displayio.Bitmap + # https://github.com/adafruit/circuitpython/issues/6675 + pixels_per_byte = 8 // depth + for x in range(0, width, pixels_per_byte): + byte = data_bytes[src] + for pixel in range(pixels_per_byte): + bmp[x + pixel, y] = ( + byte >> ((pixels_per_byte - pixel - 1) * depth) + ) & ((1 << depth) - 1) + src += 1 + else: + mem[dst : dst + scanline] = data_bytes[src : src + scanline] return bmp, pal # RGB, RGBA or Grayscale import displayio From 7469a784f1c0fb26124c56760397169a099e41c3 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sat, 3 Aug 2024 11:21:24 -0500 Subject: [PATCH 15/59] use ruff. add optional different format types to png example --- .gitattributes | 5 + .pre-commit-config.yaml | 42 +- .pylintrc | 399 ------------------ README.rst | 6 +- adafruit_imageload/__init__.py | 18 +- adafruit_imageload/bmp/__init__.py | 11 +- adafruit_imageload/bmp/indexed.py | 22 +- adafruit_imageload/bmp/truecolor.py | 22 +- adafruit_imageload/displayio_types.py | 4 +- adafruit_imageload/gif.py | 32 +- adafruit_imageload/jpg.py | 3 +- adafruit_imageload/png.py | 24 +- adafruit_imageload/pnm/__init__.py | 26 +- adafruit_imageload/pnm/pbm_ascii.py | 5 +- adafruit_imageload/pnm/pbm_binary.py | 6 +- adafruit_imageload/pnm/pgm/__init__.py | 12 +- adafruit_imageload/pnm/pgm/ascii.py | 13 +- adafruit_imageload/pnm/pgm/binary.py | 13 +- adafruit_imageload/pnm/ppm_ascii.py | 12 +- adafruit_imageload/pnm/ppm_binary.py | 10 +- adafruit_imageload/tilegrid_inflator.py | 11 +- docs/conf.py | 8 +- examples/imageload_colorwheel.py | 1 + examples/imageload_from_web.py | 11 +- examples/imageload_jpg_simpletest.py | 1 + examples/imageload_magtag_simpletest.py | 3 + examples/imageload_netpbm.py | 7 +- examples/imageload_png_simpletest.py | 10 +- examples/imageload_simpletest.py | 1 + .../imageload_tilegrid_inflator_simpletest.py | 1 + examples/images/test_image_2bit.png.license | 2 + .../images/test_image_grayscale.png.license | 2 + examples/images/test_image_rgb.png.license | 2 + ruff.toml | 99 +++++ tests/displayio_shared_bindings.py | 26 +- tests/test_bitmap_c_interface.py | 12 +- tests/test_bmp_indexed_load.py | 6 +- tests/test_palette_c_interface.py | 18 +- tests/test_pbm_load.py | 13 +- tests/test_pgm_load.py | 3 + tests/test_ppm_load.py | 3 + 41 files changed, 308 insertions(+), 617 deletions(-) create mode 100644 .gitattributes delete mode 100644 .pylintrc create mode 100644 examples/images/test_image_2bit.png.license create mode 100644 examples/images/test_image_grayscale.png.license create mode 100644 examples/images/test_image_rgb.png.license create mode 100644 ruff.toml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d54c593 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries +# +# SPDX-License-Identifier: Unlicense + +* text eol=lf diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70ade69..f27b786 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,42 +1,22 @@ # SPDX-FileCopyrightText: 2020 Diego Elio Pettenò +# SPDX-FileCopyrightText: 2024 Justin Myers # # SPDX-License-Identifier: Unlicense repos: - - repo: https://github.com/python/black - rev: 23.3.0 - hooks: - - id: black - - repo: https://github.com/fsfe/reuse-tool - rev: v1.1.2 - hooks: - - id: reuse - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - - repo: https://github.com/pycqa/pylint - rev: v2.17.4 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.3.4 hooks: - - id: pylint - name: pylint (library code) - types: [python] - args: - - --disable=consider-using-f-string - exclude: "^(docs/|examples/|tests/|setup.py$)" - - id: pylint - name: pylint (example code) - description: Run pylint rules on "examples/*.py" files - types: [python] - files: "^examples/" - args: - - --disable=missing-docstring,invalid-name,consider-using-f-string,duplicate-code - - id: pylint - name: pylint (test code) - description: Run pylint rules on "tests/*.py" files - types: [python] - files: "^tests/" - args: - - --disable=missing-docstring,consider-using-f-string,duplicate-code + - id: ruff-format + - id: ruff + args: ["--fix"] + - repo: https://github.com/fsfe/reuse-tool + rev: v3.0.1 + hooks: + - id: reuse diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index f945e92..0000000 --- a/.pylintrc +++ /dev/null @@ -1,399 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Scott Shawcroft, written for Adafruit Industries -# -# SPDX-License-Identifier: Unlicense - -[MASTER] - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code -extension-pkg-whitelist= - -# Add files or directories to the ignore-list. They should be base names, not -# paths. -ignore=CVS - -# Add files or directories matching the regex patterns to the ignore-list. The -# regex matches against base names, not paths. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. -jobs=1 - -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins=pylint.extensions.no_self_use - -# Pickle collected data for later comparisons. -persistent=yes - -# Specify a configuration file. -#rcfile= - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED -confidence= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once).You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use"--disable=all --enable=classes -# --disable=W" -# disable=import-error,raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,deprecated-str-translate-call -disable=raw-checker-failed,bad-inline-option,locally-disabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,import-error,pointless-string-statement,unspecified-encoding - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -enable= - - -[REPORTS] - -# Python expression which should return a note less than 10 (10 is the highest -# note). You have access to the variables errors warning, statement which -# respectively contain the number of errors / warnings messages and the total -# number of statements analyzed. This is used by the global evaluation report -# (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details -#msg-template= - -# Set the output format. Available formats are text, parseable, colorized, json -# and msvs (visual studio).You can also give a reporter class, eg -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Tells whether to display a full report or only the messages -reports=no - -# Activate the evaluation score. -score=yes - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - - -[LOGGING] - -# Logging modules to check that the string format arguments are in logging -# function parameter format -logging-modules=logging - - -[SPELLING] - -# Spelling dictionary name. Available dictionaries: none. To make it working -# install python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to indicated private dictionary in -# --spelling-private-dict-file option instead of raising a message. -spelling-store-unknown-words=no - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -# notes=FIXME,XXX,TODO -notes=FIXME,XXX - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# This flag controls whether pylint should warn about no-member and similar -# checks whenever an opaque object is returned when inferring. The inference -# can return multiple potential results while evaluating a Python object, but -# some branches might not be evaluated, which results in partial inference. In -# that case, it might be useful to still emit no-member and other checks for -# the rest of the inferred objects. -ignore-on-opaque-inference=yes - -# List of class names for which member attributes should not be checked (useful -# for classes with dynamically set attributes). This supports the use of -# qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis. It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules=board - -# Show a hint with possible names when a member name was not found. The aspect -# of finding the hint is based on edit distance. -missing-member-hint=yes - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - - -[VARIABLES] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid to define new builtins when possible. -additional-builtins= - -# Tells whether unused global variables should be treated as a violation. -allow-global-unused-variables=yes - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_,_cb - -# A regular expression matching the name of dummy variables (i.e. expectedly -# not used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore -ignored-argument-names=_.*|^ignored_|^unused_ - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,future.builtins - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -# expected-line-ending-format= -expected-line-ending-format=LF - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=100 - -# Maximum number of lines in a module -max-module-lines=1000 - -# Allow the body of a class to be on the same line as the declaration if body -# contains single statement. -single-line-class-stmt=no - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=yes - -# Minimum lines number of a similarity. -min-similarity-lines=12 - - -[BASIC] - -# Regular expression matching correct argument names -argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct attribute names -attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Bad variable names which should always be refused, separated by a comma -bad-names=foo,bar,baz,toto,tutu,tata - -# Regular expression matching correct class attribute names -class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ - -# Regular expression matching correct class names -# class-rgx=[A-Z_][a-zA-Z0-9]+$ -class-rgx=[A-Z_][a-zA-Z0-9_]+$ - -# Regular expression matching correct constant names -const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Regular expression matching correct function names -function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Good variable names which should always be accepted, separated by a comma -# good-names=i,j,k,ex,Run,_ -good-names=r,g,b,w,i,j,k,n,x,y,z,ex,ok,Run,_ - -# Include a hint for the correct naming format with invalid-name -include-naming-hint=no - -# Regular expression matching correct inline iteration names -inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ - -# Regular expression matching correct method names -method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - -# Regular expression matching correct module names -module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -property-classes=abc.abstractproperty - -# Regular expression matching correct variable names -variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$ - - -[IMPORTS] - -# Allow wildcard imports from modules that define __all__. -allow-wildcard-with-all=no - -# Analyse import fallback blocks. This can be used to support both Python 2 and -# 3 compatible code, which means that the block might have code that exists -# only in one or another interpreter, leading to false positives when analysed. -analyse-fallback-blocks=no - -# Deprecated modules which should not be used, separated by a comma -deprecated-modules=optparse,tkinter.tix - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled) -ext-import-graph= - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled) -import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled) -int-import-graph= - -# Force import order to recognize a module as part of the standard -# compatibility libraries. -known-standard-library= - -# Force import order to recognize a module as part of a third party library. -known-third-party=enchant - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__,__new__,setUp - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict,_fields,_replace,_source,_make - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=mcs - - -[DESIGN] - -# Maximum number of arguments for function / method -max-args=5 - -# Maximum number of attributes for a class (see R0902). -# max-attributes=7 -max-attributes=11 - -# Maximum number of boolean expressions in a if statement -max-bool-expr=5 - -# Maximum number of branch for function / method body -max-branches=12 - -# Maximum number of locals for function / method body -max-locals=15 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - -# Maximum number of return / yield for function / method body -max-returns=6 - -# Maximum number of statements in function / method body -max-statements=50 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=1 - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "Exception" -overgeneral-exceptions=builtins.Exception diff --git a/README.rst b/README.rst index 8d7124a..c698f93 100644 --- a/README.rst +++ b/README.rst @@ -13,9 +13,9 @@ Introduction :target: https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad/actions/ :alt: Build Status -.. image:: https://img.shields.io/badge/code%20style-black-000000.svg - :target: https://github.com/psf/black - :alt: Code Style: Black +.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json + :target: https://github.com/astral-sh/ruff + :alt: Code Style: Ruff This library decodes an image file into new bitmap and palette objects of the provided type. It's designed to load code needed during decoding as needed. This is meant to minimize the memory diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index 3f632a6..bf7d3e2 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -12,20 +12,21 @@ * Author(s): Scott Shawcroft, Matt Land """ -# pylint: disable=import-outside-toplevel try: + from io import BufferedReader from typing import ( - Tuple, + Iterable, Iterator, - Optional, List, - Iterable, + Optional, + Tuple, Union, ) - from io import BufferedReader - from displayio import Palette, Bitmap - from .displayio_types import PaletteConstructor, BitmapConstructor + + from displayio import Bitmap, Palette + + from .displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -37,7 +38,7 @@ def load( file_or_filename: Union[str, BufferedReader], *, bitmap: Optional[BitmapConstructor] = None, - palette: Optional[PaletteConstructor] = None + palette: Optional[PaletteConstructor] = None, ) -> Tuple[Bitmap, Optional[Palette]]: """Load pixel values (indices or colors) into a bitmap and colors into a palette. @@ -47,7 +48,6 @@ def load( palette is the desired palette type. The constructor should take the number of colors and support assignment to indices via []. """ - # pylint: disable=too-many-branches if not bitmap or not palette: try: # use displayio if available diff --git a/adafruit_imageload/bmp/__init__.py b/adafruit_imageload/bmp/__init__.py index 56d9b7c..d7b9801 100755 --- a/adafruit_imageload/bmp/__init__.py +++ b/adafruit_imageload/bmp/__init__.py @@ -12,13 +12,14 @@ * Author(s): Scott Shawcroft, Matt Land """ -# pylint: disable=import-outside-toplevel try: - from typing import Tuple, Optional, Set, List from io import BufferedReader - from displayio import Palette, Bitmap - from ..displayio_types import PaletteConstructor, BitmapConstructor + from typing import List, Optional, Set, Tuple + + from displayio import Bitmap, Palette + + from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -30,7 +31,7 @@ def load( file: BufferedReader, *, bitmap: Optional[BitmapConstructor] = None, - palette: Optional[PaletteConstructor] = None + palette: Optional[PaletteConstructor] = None, ) -> Tuple[Optional[Bitmap], Optional[Palette]]: """Loads a bmp image from the open ``file``. diff --git a/adafruit_imageload/bmp/indexed.py b/adafruit_imageload/bmp/indexed.py index 134b9b3..8168921 100755 --- a/adafruit_imageload/bmp/indexed.py +++ b/adafruit_imageload/bmp/indexed.py @@ -13,28 +13,29 @@ """ - import sys try: - from typing import Tuple, Optional from io import BufferedReader - from displayio import Palette, Bitmap - from ..displayio_types import PaletteConstructor, BitmapConstructor + from typing import Optional, Tuple + + from displayio import Bitmap, Palette + + from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass try: from bitmaptools import readinto as _bitmap_readinto except ImportError: - _bitmap_readinto = None # pylint: disable=invalid-name # type: Callable + _bitmap_readinto = None __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" -def load( +def load( # noqa: PLR0913, PLR0912, Too many arguments in function definition, Too many branches file: BufferedReader, width: int, height: int, @@ -58,7 +59,6 @@ def load( :param BitmapConstructor bitmap: a function that returns a displayio.Bitmap :param PaletteConstructor palette: a function that returns a displayio.Palette """ - # pylint: disable=too-many-arguments,too-many-locals,too-many-branches palette_obj = None if palette: palette_obj = palette(colors) @@ -78,7 +78,6 @@ def load( minimum_color_depth *= 2 if sys.maxsize > 1073741823: - # pylint: disable=import-outside-toplevel, relative-beyond-top-level from .negative_height_check import negative_height_check # convert unsigned int to signed int when height is negative @@ -121,9 +120,7 @@ def load( for x in range(width): i = x // pixels_per_byte - pixel = ( - chunk[i] >> (8 - color_depth * (x % pixels_per_byte + 1)) - ) & mask + pixel = (chunk[i] >> (8 - color_depth * (x % pixels_per_byte + 1))) & mask bitmap_obj[offset + x] = pixel elif compression in (1, 2): decode_rle( @@ -137,7 +134,7 @@ def load( return bitmap_obj, palette_obj -def decode_rle( +def decode_rle( # noqa: PLR0912 Too many branches bitmap: Bitmap, file: BufferedReader, compression: int, @@ -145,7 +142,6 @@ def decode_rle( width: int, ) -> None: """Helper to decode RLE images""" - # pylint: disable=too-many-locals,too-many-nested-blocks,too-many-branches # RLE algorithm, either 8-bit (1) or 4-bit (2) # diff --git a/adafruit_imageload/bmp/truecolor.py b/adafruit_imageload/bmp/truecolor.py index b1b0889..1e6dccd 100755 --- a/adafruit_imageload/bmp/truecolor.py +++ b/adafruit_imageload/bmp/truecolor.py @@ -16,13 +16,14 @@ import sys try: - from typing import Union, Optional, Tuple from io import BufferedReader + from typing import Optional, Tuple, Union + from ..displayio_types import BitmapConstructor except ImportError: pass -from displayio import ColorConverter, Colorspace, Bitmap +from displayio import Bitmap, ColorConverter, Colorspace __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" @@ -52,7 +53,7 @@ def bitfield_format(bitfield_mask): return None -def load( +def load( # noqa: PLR0912, PLR0913, Too many branches, Too many arguments in function definition file: BufferedReader, width: int, height: int, @@ -73,7 +74,6 @@ def load( :param dict bitfield_masks: The bitfield masks for each color if using bitfield compression :param BitmapConstructor bitmap: a function that returns a displayio.Bitmap """ - # pylint: disable=too-many-arguments,too-many-locals,too-many-branches converter_obj = None bitmap_obj = None if bitmap: @@ -90,7 +90,6 @@ def load( input_colorspace = Colorspace.RGB555 converter_obj = ColorConverter(input_colorspace=input_colorspace) if sys.maxsize > 1073741823: - # pylint: disable=import-outside-toplevel, relative-beyond-top-level from .negative_height_check import negative_height_check # convert unsigned int to signed int when height is negative @@ -119,19 +118,14 @@ def load( color = 0 for byte in range(bytes_per_pixel): color |= chunk[i + byte] << (8 * byte) - mask = ( - bitfield_masks["red"] - | bitfield_masks["green"] - | bitfield_masks["blue"] - ) + mask = bitfield_masks["red"] | bitfield_masks["green"] | bitfield_masks["blue"] if color_depth in (24, 32): mask = mask >> 8 pixel = color & mask + elif color_depth == 16: + pixel = chunk[i] | chunk[i + 1] << 8 else: - if color_depth == 16: - pixel = chunk[i] | chunk[i + 1] << 8 - else: - pixel = chunk[i + 2] << 16 | chunk[i + 1] << 8 | chunk[i] + pixel = chunk[i + 2] << 16 | chunk[i + 1] << 8 | chunk[i] bitmap_obj[offset + x] = converter_obj.convert(pixel) return bitmap_obj, ColorConverter(input_colorspace=Colorspace.RGB565) diff --git a/adafruit_imageload/displayio_types.py b/adafruit_imageload/displayio_types.py index c46006a..f2adcc7 100644 --- a/adafruit_imageload/displayio_types.py +++ b/adafruit_imageload/displayio_types.py @@ -13,9 +13,11 @@ * Author(s): Matt Land """ + try: from typing import Callable - from displayio import Palette, Bitmap + + from displayio import Bitmap, Palette PaletteConstructor = Callable[[int], Palette] BitmapConstructor = Callable[[int, int, int], Bitmap] diff --git a/adafruit_imageload/gif.py b/adafruit_imageload/gif.py index f1a05e4..e5183c1 100644 --- a/adafruit_imageload/gif.py +++ b/adafruit_imageload/gif.py @@ -17,10 +17,12 @@ import struct try: - from typing import Tuple, Iterator, Optional, List from io import BufferedReader - from displayio import Palette, Bitmap - from .displayio_types import PaletteConstructor, BitmapConstructor + from typing import Iterator, List, Optional, Tuple + + from displayio import Bitmap, Palette + + from .displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -29,10 +31,7 @@ def load( - file: BufferedReader, - *, - bitmap: BitmapConstructor, - palette: Optional[PaletteConstructor] = None + file: BufferedReader, *, bitmap: BitmapConstructor, palette: Optional[PaletteConstructor] = None ) -> Tuple[Bitmap, Optional[Palette]]: """Loads a GIF image from the open ``file``. @@ -47,9 +46,7 @@ def load( header = file.read(6) if header not in {b"GIF87a", b"GIF89a"}: raise ValueError("Not a GIF file") - width, height, flags, _, _ = struct.unpack( # pylint: disable=no-member - " None: """Read a single frame and apply it to the bitmap.""" - ddx, ddy, width, _, flags = struct.unpack( # pylint: disable=no-member - " bytes: value = self.last + self.last[0:1] if self.last: self.codes.append(self.last + value[0:1]) - if ( - len(self.codes) + self.end_code + 1 >= 1 << self.code_len - and self.code_len < 12 - ): + if len(self.codes) + self.end_code + 1 >= 1 << self.code_len and self.code_len < 12: self.code_len += 1 self.last = value return value @@ -159,7 +151,7 @@ def lzw_decode(data: Iterator[int], code_size: int) -> Iterator[bytes]: dictionary = LZWDict(code_size) bit = 0 try: - byte = next(data) # pylint: disable=stop-iteration-return + byte = next(data) try: while True: code = 0 @@ -168,10 +160,10 @@ def lzw_decode(data: Iterator[int], code_size: int) -> Iterator[bytes]: bit += 1 if bit >= 8: bit = 0 - byte = next(data) # pylint: disable=stop-iteration-return + byte = next(data) yield dictionary.decode(code) except EndOfData: while True: - next(data) # pylint: disable=stop-iteration-return + next(data) except StopIteration: pass diff --git a/adafruit_imageload/jpg.py b/adafruit_imageload/jpg.py index 9af3d60..ad5174c 100644 --- a/adafruit_imageload/jpg.py +++ b/adafruit_imageload/jpg.py @@ -21,7 +21,8 @@ try: from io import BufferedReader - from typing import Tuple, Optional + from typing import Optional, Tuple + from .displayio_types import BitmapConstructor except ImportError: pass diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 404d503..84867b9 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -18,8 +18,10 @@ try: from io import BufferedReader from typing import Optional, Tuple - from displayio import Palette, Bitmap - from .displayio_types import PaletteConstructor, BitmapConstructor + + from displayio import Bitmap, Palette + + from .displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -30,11 +32,8 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" -def load( - file: BufferedReader, - *, - bitmap: BitmapConstructor, - palette: Optional[PaletteConstructor] = None +def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements + file: BufferedReader, *, bitmap: BitmapConstructor, palette: Optional[PaletteConstructor] = None ) -> Tuple[Bitmap, Optional[Palette]]: """ Loads a PNG image from the open ``file``. @@ -49,7 +48,6 @@ def load( :param object palette: Type to store the palette. Must have API similar to `displayio.Palette`. Will be skipped if None. """ - # pylint: disable=too-many-locals, too-many-branches, consider-using-enumerate, too-many-statements, import-outside-toplevel, invalid-name header = file.read(8) if header != b"\x89PNG\r\n\x1a\n": raise ValueError("Not a PNG file") @@ -119,9 +117,9 @@ def load( for x in range(0, width, pixels_per_byte): byte = data_bytes[src] for pixel in range(pixels_per_byte): - bmp[x + pixel, y] = ( - byte >> ((pixels_per_byte - pixel - 1) * depth) - ) & ((1 << depth) - 1) + bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( + (1 << depth) - 1 + ) src += 1 else: mem[dst : dst + scanline] = data_bytes[src : src + scanline] @@ -184,9 +182,7 @@ def load( elif mode in {2, 6}: # rgb for x in range(width): bmp[x, y] = pal.convert( - (line[x * unit + 0] << 16) - | (line[x * unit + 1] << 8) - | line[x * unit + 2] + (line[x * unit + 0] << 16) | (line[x * unit + 1] << 8) | line[x * unit + 2] ) else: raise ValueError("Unsupported color mode.") diff --git a/adafruit_imageload/pnm/__init__.py b/adafruit_imageload/pnm/__init__.py index 66b731d..7a18aeb 100644 --- a/adafruit_imageload/pnm/__init__.py +++ b/adafruit_imageload/pnm/__init__.py @@ -14,21 +14,22 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ -# pylint: disable=import-outside-toplevel try: + from io import BufferedReader from typing import ( - Tuple, + Callable, + Iterable, Iterator, - Optional, List, - Iterable, + Optional, + Tuple, Union, - Callable, ) - from io import BufferedReader - from displayio import Palette, Bitmap - from ..displayio_types import PaletteConstructor, BitmapConstructor + + from displayio import Bitmap, Palette + + from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -36,12 +37,12 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" -def load( +def load( # noqa: PLR0912 Too many branches file: BufferedReader, header: bytes, *, bitmap: Optional[BitmapConstructor] = None, - palette: Optional[PaletteConstructor] = None + palette: Optional[PaletteConstructor] = None, ) -> Tuple[Optional[Bitmap], Optional[Palette]]: """ Scan for netpbm format info, skip over comments, and delegate to a submodule @@ -50,7 +51,6 @@ def load( All other formats have three: width, height, and max color value. This load function will move the file stream pointer to the start of data in all cases. """ - # pylint: disable=too-many-branches magic_number = header[:2] file.seek(2) pnm_header = [] # type: List[int] @@ -100,7 +100,7 @@ def load( palette_obj = None if palette: palette_obj = palette(1) - palette_obj[0] = b"\xFF\xFF\xFF" + palette_obj[0] = b"\xff\xff\xff" if magic_number.startswith(b"P1"): from . import pbm_ascii @@ -124,7 +124,7 @@ def load( next_byte = file.read(1) if next_byte == b"": - raise RuntimeError("Unsupported image format {!r}".format(magic_number)) + raise RuntimeError(f"Unsupported image format {magic_number!r}") if next_byte == b"#": # comment found, seek until a newline or EOF is found while file.read(1) not in [b"", b"\n"]: # EOF or NL pass diff --git a/adafruit_imageload/pnm/pbm_ascii.py b/adafruit_imageload/pnm/pbm_ascii.py index 0122132..872846c 100644 --- a/adafruit_imageload/pnm/pbm_ascii.py +++ b/adafruit_imageload/pnm/pbm_ascii.py @@ -17,9 +17,10 @@ """ try: - from typing import Tuple, Optional from io import BufferedReader - from displayio import Palette, Bitmap + from typing import Optional, Tuple + + from displayio import Bitmap, Palette except ImportError: pass diff --git a/adafruit_imageload/pnm/pbm_binary.py b/adafruit_imageload/pnm/pbm_binary.py index 263cb2c..cecdba5 100644 --- a/adafruit_imageload/pnm/pbm_binary.py +++ b/adafruit_imageload/pnm/pbm_binary.py @@ -15,10 +15,12 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ + try: - from typing import Tuple, Optional, Iterator from io import BufferedReader - from displayio import Palette, Bitmap + from typing import Iterator, Optional, Tuple + + from displayio import Bitmap, Palette except ImportError: pass diff --git a/adafruit_imageload/pnm/pgm/__init__.py b/adafruit_imageload/pnm/pgm/__init__.py index 3ed43f7..8acefb5 100644 --- a/adafruit_imageload/pnm/pgm/__init__.py +++ b/adafruit_imageload/pnm/pgm/__init__.py @@ -14,12 +14,14 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ -# pylint: disable=import-outside-toplevel + try: - from typing import Tuple, Optional, Set, List from io import BufferedReader - from displayio import Palette, Bitmap - from ...displayio_types import PaletteConstructor, BitmapConstructor + from typing import List, Optional, Set, Tuple + + from displayio import Bitmap, Palette + + from ...displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -30,7 +32,7 @@ def load( header: List[int], *, bitmap: Optional[BitmapConstructor] = None, - palette: Optional[PaletteConstructor] = None + palette: Optional[PaletteConstructor] = None, ) -> Tuple[Optional[Bitmap], Optional[Palette]]: """ Perform the load of Netpbm greyscale images (P2, P5) diff --git a/adafruit_imageload/pnm/pgm/ascii.py b/adafruit_imageload/pnm/pgm/ascii.py index 097665f..7c597ca 100644 --- a/adafruit_imageload/pnm/pgm/ascii.py +++ b/adafruit_imageload/pnm/pgm/ascii.py @@ -14,11 +14,14 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ + try: - from typing import Tuple, Set, Optional from io import BufferedReader - from displayio import Palette, Bitmap - from ...displayio_types import PaletteConstructor, BitmapConstructor + from typing import Optional, Set, Tuple + + from displayio import Bitmap, Palette + + from ...displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -66,9 +69,7 @@ def load( return bitmap_obj, palette_obj -def build_palette( - palette_class: PaletteConstructor, palette_colors: Set[int] -) -> Palette: # pylint: disable=duplicate-code +def build_palette(palette_class: PaletteConstructor, palette_colors: Set[int]) -> Palette: """ construct the Palette, and populate it with the set of palette_colors """ diff --git a/adafruit_imageload/pnm/pgm/binary.py b/adafruit_imageload/pnm/pgm/binary.py index 7e8c56b..700b563 100644 --- a/adafruit_imageload/pnm/pgm/binary.py +++ b/adafruit_imageload/pnm/pgm/binary.py @@ -14,11 +14,14 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ + try: - from typing import Tuple, Optional, Set from io import BufferedReader - from displayio import Palette, Bitmap - from ...displayio_types import PaletteConstructor, BitmapConstructor + from typing import Optional, Set, Tuple + + from displayio import Bitmap, Palette + + from ...displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -54,9 +57,7 @@ def load( return bitmap_obj, palette_obj -def build_palette( - palette_class: PaletteConstructor, palette_colors: Set[int] -) -> Palette: +def build_palette(palette_class: PaletteConstructor, palette_colors: Set[int]) -> Palette: """ construct the Palette, and populate it with the set of palette_colors """ diff --git a/adafruit_imageload/pnm/ppm_ascii.py b/adafruit_imageload/pnm/ppm_ascii.py index f6bb88b..e79b70b 100644 --- a/adafruit_imageload/pnm/ppm_ascii.py +++ b/adafruit_imageload/pnm/ppm_ascii.py @@ -20,16 +20,18 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" try: + from io import BufferedReader from typing import ( - Tuple, Iterator, - Optional, List, + Optional, Set, + Tuple, ) - from io import BufferedReader - from displayio import Palette, Bitmap - from ..displayio_types import PaletteConstructor, BitmapConstructor + + from displayio import Bitmap, Palette + + from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass diff --git a/adafruit_imageload/pnm/ppm_binary.py b/adafruit_imageload/pnm/ppm_binary.py index b726dc4..56540d3 100644 --- a/adafruit_imageload/pnm/ppm_binary.py +++ b/adafruit_imageload/pnm/ppm_binary.py @@ -15,11 +15,14 @@ * Author(s): Matt Land, Brooke Storm, Sam McGahan """ + try: - from typing import Tuple, Optional, Set from io import BufferedReader - from displayio import Palette, Bitmap - from ..displayio_types import PaletteConstructor, BitmapConstructor + from typing import Optional, Set, Tuple + + from displayio import Bitmap, Palette + + from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: pass @@ -38,7 +41,6 @@ def load( Load pixel values (indices or colors) into a bitmap and for a binary ppm, return None for pallet. """ - # pylint: disable=too-many-locals data_start = file.tell() palette_colors = set() # type: Set[Tuple[int, int, int]] diff --git a/adafruit_imageload/tilegrid_inflator.py b/adafruit_imageload/tilegrid_inflator.py index db6c65f..89a3458 100644 --- a/adafruit_imageload/tilegrid_inflator.py +++ b/adafruit_imageload/tilegrid_inflator.py @@ -13,12 +13,15 @@ * Author(s): Tim Cocks, Matt Land """ + import displayio + import adafruit_imageload try: - from typing import Tuple, Optional, List, Union - from displayio import Palette, Bitmap, OnDiskBitmap, TileGrid + from typing import List, Optional, Tuple, Union + + from displayio import Bitmap, OnDiskBitmap, Palette, TileGrid except ImportError: pass @@ -26,7 +29,7 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" -def inflate_tilegrid( +def inflate_tilegrid( # noqa: PLR0913, PLR0912, Too many arguments in function definition, Too many branches bmp_path: Optional[str] = None, target_size: Tuple[int, int] = (3, 3), tile_size: Optional[List[int]] = None, @@ -48,8 +51,6 @@ def inflate_tilegrid( :param Optional[Palette] bmp_palette: Already loaded spritesheet Palette """ - # pylint: disable=too-many-arguments, too-many-locals, too-many-branches - if bmp_path is None and (bmp_obj is None and bmp_palette is None): raise AttributeError("Must pass either bmp_path or bmp_obj and bmp_palette") diff --git a/docs/conf.py b/docs/conf.py index 86f66b4..7e8361c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- - # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries # # SPDX-License-Identifier: MIT +import datetime import os import sys -import datetime sys.path.insert(0, os.path.abspath("..")) @@ -48,9 +46,7 @@ creation_year = "2018" current_year = str(datetime.datetime.now().year) year_duration = ( - current_year - if current_year == creation_year - else creation_year + " - " + current_year + current_year if current_year == creation_year else creation_year + " - " + current_year ) copyright = year_duration + " Scott Shawcroft" author = "Scott Shawcroft" diff --git a/examples/imageload_colorwheel.py b/examples/imageload_colorwheel.py index d43d378..58bc889 100644 --- a/examples/imageload_colorwheel.py +++ b/examples/imageload_colorwheel.py @@ -3,6 +3,7 @@ import board import displayio + import adafruit_imageload display = board.DISPLAY diff --git a/examples/imageload_from_web.py b/examples/imageload_from_web.py index 283eb59..9a873a8 100644 --- a/examples/imageload_from_web.py +++ b/examples/imageload_from_web.py @@ -4,14 +4,16 @@ imageload example for esp32s2 that loads an image fetched via adafruit_requests using BytesIO """ -from io import BytesIO + import ssl -import wifi -import socketpool +from io import BytesIO +import adafruit_requests as requests import board import displayio -import adafruit_requests as requests +import socketpool +import wifi + import adafruit_imageload # Get wifi details and more from a secrets.py file @@ -28,7 +30,6 @@ socket = socketpool.SocketPool(wifi.radio) https = requests.Session(socket, ssl.create_default_context()) -# pylint: disable=line-too-long url = "https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_ImageLoad/main/examples/images/4bit.bmp" print("Fetching text from %s" % url) diff --git a/examples/imageload_jpg_simpletest.py b/examples/imageload_jpg_simpletest.py index dc4b8ef..93f2a2f 100644 --- a/examples/imageload_jpg_simpletest.py +++ b/examples/imageload_jpg_simpletest.py @@ -8,6 +8,7 @@ import board import displayio + import adafruit_imageload group = displayio.Group() diff --git a/examples/imageload_magtag_simpletest.py b/examples/imageload_magtag_simpletest.py index ad95515..cbee121 100644 --- a/examples/imageload_magtag_simpletest.py +++ b/examples/imageload_magtag_simpletest.py @@ -5,9 +5,12 @@ Basic imageload example script adapted for use on MagTag. """ + import time + import board import displayio + import adafruit_imageload # use built in display (PyPortal, PyGamer, PyBadge, CLUE, etc.) diff --git a/examples/imageload_netpbm.py b/examples/imageload_netpbm.py index b896e6e..06ca3f1 100644 --- a/examples/imageload_netpbm.py +++ b/examples/imageload_netpbm.py @@ -12,9 +12,10 @@ """ +import adafruit_ili9341 import board import displayio -import adafruit_ili9341 + import adafruit_imageload spi = board.SPI() @@ -36,9 +37,7 @@ # image = "images/netpbm_p5_binary.pgm" image = "images/netpbm_p6_binary.ppm" -bitmap, palette = adafruit_imageload.load( - image, bitmap=displayio.Bitmap, palette=displayio.Palette -) +bitmap, palette = adafruit_imageload.load(image, bitmap=displayio.Bitmap, palette=displayio.Palette) bg_sprite = displayio.TileGrid(bitmap, pixel_shader=palette, x=0, y=0) diff --git a/examples/imageload_png_simpletest.py b/examples/imageload_png_simpletest.py index 07484e7..106ea69 100644 --- a/examples/imageload_png_simpletest.py +++ b/examples/imageload_png_simpletest.py @@ -4,13 +4,17 @@ import board import displayio from vectorio import Rectangle + import adafruit_imageload # built-in display display = board.DISPLAY -# load png image +# load png image. Uncomment to try other supported formats. image, palette = adafruit_imageload.load("images/test_image.png") +# image, palette = adafruit_imageload.load("images/test_image_grayscale.png") +# image, palette = adafruit_imageload.load("images/test_image_rgb.png") +# image, palette = adafruit_imageload.load("images/test_image_2bit.png") # Set the transparency index color to be hidden palette.make_transparent(0) @@ -23,9 +27,7 @@ # make a blank background bg_palette = displayio.Palette(1) bg_palette[0] = 0xFFFFFF -rect = Rectangle( - pixel_shader=bg_palette, width=display.width, height=display.height, x=0, y=0 -) +rect = Rectangle(pixel_shader=bg_palette, width=display.width, height=display.height, x=0, y=0) # make a group to show on the display group = displayio.Group() diff --git a/examples/imageload_simpletest.py b/examples/imageload_simpletest.py index fbfc52d..1481791 100644 --- a/examples/imageload_simpletest.py +++ b/examples/imageload_simpletest.py @@ -3,6 +3,7 @@ import board import displayio + import adafruit_imageload image, palette = adafruit_imageload.load("images/4bit.bmp") diff --git a/examples/imageload_tilegrid_inflator_simpletest.py b/examples/imageload_tilegrid_inflator_simpletest.py index 50463a0..867b6b5 100644 --- a/examples/imageload_tilegrid_inflator_simpletest.py +++ b/examples/imageload_tilegrid_inflator_simpletest.py @@ -3,6 +3,7 @@ import board import displayio + import adafruit_imageload from adafruit_imageload.tilegrid_inflator import inflate_tilegrid diff --git a/examples/images/test_image_2bit.png.license b/examples/images/test_image_2bit.png.license new file mode 100644 index 0000000..6a552de --- /dev/null +++ b/examples/images/test_image_2bit.png.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2024 Foamyguy +# SPDX-License-Identifier: MIT diff --git a/examples/images/test_image_grayscale.png.license b/examples/images/test_image_grayscale.png.license new file mode 100644 index 0000000..ad03cf2 --- /dev/null +++ b/examples/images/test_image_grayscale.png.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022 ladyada for Adafruit Industries +# SPDX-License-Identifier: MIT diff --git a/examples/images/test_image_rgb.png.license b/examples/images/test_image_rgb.png.license new file mode 100644 index 0000000..ad03cf2 --- /dev/null +++ b/examples/images/test_image_rgb.png.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2022 ladyada for Adafruit Industries +# SPDX-License-Identifier: MIT diff --git a/ruff.toml b/ruff.toml new file mode 100644 index 0000000..db37c83 --- /dev/null +++ b/ruff.toml @@ -0,0 +1,99 @@ +# SPDX-FileCopyrightText: 2024 Tim Cocks for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +target-version = "py38" +line-length = 100 + +[lint] +select = ["I", "PL", "UP"] + +extend-select = [ + "D419", # empty-docstring + "E501", # line-too-long + "W291", # trailing-whitespace + "PLC0414", # useless-import-alias + "PLC2401", # non-ascii-name + "PLC2801", # unnecessary-dunder-call + "PLC3002", # unnecessary-direct-lambda-call + "E999", # syntax-error + "PLE0101", # return-in-init + "F706", # return-outside-function + "F704", # yield-outside-function + "PLE0116", # continue-in-finally + "PLE0117", # nonlocal-without-binding + "PLE0241", # duplicate-bases + "PLE0302", # unexpected-special-method-signature + "PLE0604", # invalid-all-object + "PLE0605", # invalid-all-format + "PLE0643", # potential-index-error + "PLE0704", # misplaced-bare-raise + "PLE1141", # dict-iter-missing-items + "PLE1142", # await-outside-async + "PLE1205", # logging-too-many-args + "PLE1206", # logging-too-few-args + "PLE1307", # bad-string-format-type + "PLE1310", # bad-str-strip-call + "PLE1507", # invalid-envvar-value + "PLE2502", # bidirectional-unicode + "PLE2510", # invalid-character-backspace + "PLE2512", # invalid-character-sub + "PLE2513", # invalid-character-esc + "PLE2514", # invalid-character-nul + "PLE2515", # invalid-character-zero-width-space + "PLR0124", # comparison-with-itself + "PLR0202", # no-classmethod-decorator + "PLR0203", # no-staticmethod-decorator + "UP004", # useless-object-inheritance + "PLR0206", # property-with-parameters + "PLR0904", # too-many-public-methods + "PLR0911", # too-many-return-statements + "PLR0912", # too-many-branches + "PLR0913", # too-many-arguments + "PLR0914", # too-many-locals + "PLR0915", # too-many-statements + "PLR0916", # too-many-boolean-expressions + "PLR1702", # too-many-nested-blocks + "PLR1704", # redefined-argument-from-local + "PLR1711", # useless-return + "C416", # unnecessary-comprehension + "PLR1733", # unnecessary-dict-index-lookup + "PLR1736", # unnecessary-list-index-lookup + + # ruff reports this rule is unstable + #"PLR6301", # no-self-use + + "PLW0108", # unnecessary-lambda + "PLW0120", # useless-else-on-loop + "PLW0127", # self-assigning-variable + "PLW0129", # assert-on-string-literal + "B033", # duplicate-value + "PLW0131", # named-expr-without-context + "PLW0245", # super-without-brackets + "PLW0406", # import-self + "PLW0602", # global-variable-not-assigned + "PLW0603", # global-statement + "PLW0604", # global-at-module-level + + # fails on the try: import typing used by libraries + #"F401", # unused-import + + "F841", # unused-variable + "E722", # bare-except + "PLW0711", # binary-op-exception + "PLW1501", # bad-open-mode + "PLW1508", # invalid-envvar-default + "PLW1509", # subprocess-popen-preexec-fn + "PLW2101", # useless-with-lock + "PLW3301", # nested-min-max +] + +ignore = [ + "PLR2004", # magic-value-comparison + "UP030", # format literals + "PLW1514", # unspecified-encoding + +] + +[format] +line-ending = "lf" diff --git a/tests/displayio_shared_bindings.py b/tests/displayio_shared_bindings.py index fcd96bc..5d796d7 100644 --- a/tests/displayio_shared_bindings.py +++ b/tests/displayio_shared_bindings.py @@ -34,6 +34,7 @@ * Author(s): Matt Land """ + from typing import Union @@ -76,9 +77,7 @@ def __setitem__(self, key: Union[tuple, int], value: int) -> None: if value > 255: raise ValueError(f"pixel value {value} too large") if self.data.get(key): - raise ValueError( - f"pixel {self._decode(key)}/{key} already set, cannot set again" - ) + raise ValueError(f"pixel {self._decode(key)}/{key} already set, cannot set again") self.data[key] = value def __getitem__(self, item: Union[tuple, int]) -> bytearray: @@ -89,9 +88,7 @@ def __getitem__(self, item: Union[tuple, int]) -> bytearray: try: return self.data[item] except KeyError as err: - raise RuntimeError( - "no data at {} [{}]".format(self._decode(item), item) - ) from err + raise RuntimeError(f"no data at {self._decode(item)} [{item}]") from err def validate(self, detect_empty_image=True) -> None: """ @@ -160,9 +157,7 @@ def __setitem__(self, key: int, value: Union[bytes, int, bytearray]) -> None: if isinstance(value, int) and value > 0xFFFFFF: raise ValueError(f"palette color int {value} is too large") if self.colors.get(key): - raise ValueError( - f"palette color {key} was already set, should not reassign" - ) + raise ValueError(f"palette color {key} was already set, should not reassign") self.colors[key] = value def __getitem__(self, item: int) -> Union[bytes, int, bytearray]: @@ -171,9 +166,7 @@ def __getitem__(self, item: int) -> Union[bytes, int, bytearray]: It is provided here for debugging purposes. """ if item >= self.num_colors: - raise ValueError( - f"palette index {item} should be less than {self.num_colors}" - ) + raise ValueError(f"palette index {item} should be less than {self.num_colors}") if not self.colors.get(item): raise ValueError(f"palette index {item} is not set") return self.colors[item] @@ -186,17 +179,14 @@ def validate(self): raise IndexError("no palette colors were set") if len(self.colors) != self.num_colors: raise IndexError( - "palette was initialized for {} colors, but only {} were inserted".format( - self.num_colors, len(self.colors) - ) + f"palette was initialized for {self.num_colors} " + f"colors, but only {len(self.colors)} were inserted" ) for i in range(self.num_colors): try: self.colors except IndexError as err: - raise ValueError( - "missing color `{}` in palette color list".format(i) - ) from err + raise ValueError(f"missing color `{i}` in palette color list") from err def __str__(self): """ diff --git a/tests/test_bitmap_c_interface.py b/tests/test_bitmap_c_interface.py index c9cb703..e4d8727 100644 --- a/tests/test_bitmap_c_interface.py +++ b/tests/test_bitmap_c_interface.py @@ -28,7 +28,9 @@ * Author(s): Matt Land """ + from unittest import TestCase + from .displayio_shared_bindings import Bitmap_C_Interface @@ -41,7 +43,7 @@ def test_init(self): def test_abs(self): b = Bitmap_C_Interface(5, 2, 1) - self.assertEqual(9, b._abs_pos(4, 1)) # pylint: disable=protected-access + self.assertEqual(9, b._abs_pos(4, 1)) def test_set_tuple(self): b = Bitmap_C_Interface(2, 4, 1) @@ -76,7 +78,7 @@ def test_max(self): def test_uninitialized(self): b = Bitmap_C_Interface(2, 4, 1) with self.assertRaises(RuntimeError): - b[1, 1] # pylint: disable=pointless-statement + b[1, 1] def test_validate_throws(self): b = Bitmap_C_Interface(2, 4, 1) @@ -95,6 +97,6 @@ def test_repr(self): def test_decode(self): b = Bitmap_C_Interface(4, 4, 1) - self.assertEqual((0, 0), b._decode(0)) # pylint: disable=protected-access - encoded = b._abs_pos(3, 3) # pylint: disable=protected-access - self.assertEqual((3, 3), b._decode(encoded)) # pylint: disable=protected-access + self.assertEqual((0, 0), b._decode(0)) + encoded = b._abs_pos(3, 3) + self.assertEqual((3, 3), b._decode(encoded)) diff --git a/tests/test_bmp_indexed_load.py b/tests/test_bmp_indexed_load.py index 5e72a38..b9c87f1 100644 --- a/tests/test_bmp_indexed_load.py +++ b/tests/test_bmp_indexed_load.py @@ -29,15 +29,15 @@ import os from unittest import TestCase + from adafruit_imageload import load + from .displayio_shared_bindings import Bitmap_C_Interface, Palette_C_Interface class TestBmpIndexedLoad(TestCase): def test_order_bgra_to_rgba(self): - test_file = os.path.join( - os.path.dirname(__file__), "..", "examples", "images", "4bit.bmp" - ) + test_file = os.path.join(os.path.dirname(__file__), "..", "examples", "images", "4bit.bmp") bitmap, palette = load( file_or_filename=test_file, diff --git a/tests/test_palette_c_interface.py b/tests/test_palette_c_interface.py index 457f468..e9c56c8 100644 --- a/tests/test_palette_c_interface.py +++ b/tests/test_palette_c_interface.py @@ -28,7 +28,9 @@ * Author(s): Matt Land """ + from unittest import TestCase + from .displayio_shared_bindings import Palette_C_Interface @@ -54,17 +56,17 @@ def test_get_int(self): @staticmethod def test_set_byte(): palette = Palette_C_Interface(1) - palette[0] = b"\xFF\xFF\xFF" + palette[0] = b"\xff\xff\xff" def test_get_byte(self): palette = Palette_C_Interface(1) - palette[0] = b"\xFF\xFF\xFF" - self.assertEqual(b"\xFF\xFF\xFF", palette[0]) + palette[0] = b"\xff\xff\xff" + self.assertEqual(b"\xff\xff\xff", palette[0]) @staticmethod def test_set_bytearray(): palette = Palette_C_Interface(1) - palette[0] = bytearray(b"\xFF\xFF\xFF") + palette[0] = bytearray(b"\xff\xff\xff") def test_prevents_out_of_range(self): palette = Palette_C_Interface(1) @@ -78,7 +80,7 @@ def test_prevents_out_of_range(self): def test_prevents_set_non_allowed(self): palette = Palette_C_Interface(1) try: - palette[0] = "\xFF\xFF\xFF" # attempt with a string, which is not allowed + palette[0] = "\xff\xff\xff" # attempt with a string, which is not allowed self.fail("exception should have thrown") except ValueError as err: if "should be" not in str(err): @@ -87,12 +89,12 @@ def test_prevents_set_non_allowed(self): @staticmethod def test_validate_success(): palette = Palette_C_Interface(1) - palette[0] = b"\xFF\xFF\xFF" + palette[0] = b"\xff\xff\xff" palette.validate() def test_validate_fails(self): palette = Palette_C_Interface(2) - palette[1] = b"\xFF\xFF\xFF" + palette[1] = b"\xff\xff\xff" try: palette.validate() self.fail("exception should have thrown") @@ -103,5 +105,5 @@ def test_validate_fails(self): @staticmethod def test_str(): palette = Palette_C_Interface(1) - palette[0] = b"\xFF\xFF\xFF" + palette[0] = b"\xff\xff\xff" print(str(palette)) diff --git a/tests/test_pbm_load.py b/tests/test_pbm_load.py index bc653eb..f1ba849 100644 --- a/tests/test_pbm_load.py +++ b/tests/test_pbm_load.py @@ -26,23 +26,24 @@ * Author(s): Matt Land """ + import os from io import BytesIO from unittest import TestCase + from adafruit_imageload import pnm from adafruit_imageload.pnm.pbm_binary import iterbits, reverse + from .displayio_shared_bindings import Bitmap_C_Interface, Palette_C_Interface class TestPbmLoad(TestCase): - def test_load_fails_with_no_header_data(self): # pylint: disable=invalid-name + def test_load_fails_with_no_header_data(self): file = BytesIO(b"some initial binary data: \x00\x01") try: - pnm.load( - file, b"P1", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface - ) + pnm.load(file, b"P1", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface) self.fail("should have failed") - except Exception as caught_exception: # pylint: disable=broad-except + except Exception as caught_exception: if "Unsupported image format" not in str(caught_exception): raise @@ -102,7 +103,7 @@ def test_load_works_p4_binary(self): self.assertEqual(15, bitmap.height) bitmap.validate() - def test_load_works_p4_binary_high_res(self): # pylint: disable=invalid-name + def test_load_works_p4_binary_high_res(self): test_file = os.path.join( os.path.dirname(__file__), "..", diff --git a/tests/test_pgm_load.py b/tests/test_pgm_load.py index dd1bc09..e5c0445 100644 --- a/tests/test_pgm_load.py +++ b/tests/test_pgm_load.py @@ -26,9 +26,12 @@ * Author(s): Matt Land """ + import os from unittest import TestCase + from adafruit_imageload import pnm + from .displayio_shared_bindings import Bitmap_C_Interface, Palette_C_Interface diff --git a/tests/test_ppm_load.py b/tests/test_ppm_load.py index bb8de7b..dfe081c 100644 --- a/tests/test_ppm_load.py +++ b/tests/test_ppm_load.py @@ -26,11 +26,14 @@ * Author(s): Matt Land """ + import os from io import BytesIO from unittest import TestCase + from adafruit_imageload import pnm from adafruit_imageload.pnm.ppm_ascii import read_three_colors + from .displayio_shared_bindings import Bitmap_C_Interface, Palette_C_Interface From c270013eeb3c5aada3c73ae0b475fc007c4c8ac9 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 5 Aug 2024 09:08:33 -0500 Subject: [PATCH 16/59] noqa exclude for f-string repr usage --- adafruit_imageload/pnm/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/pnm/__init__.py b/adafruit_imageload/pnm/__init__.py index 7a18aeb..b178299 100644 --- a/adafruit_imageload/pnm/__init__.py +++ b/adafruit_imageload/pnm/__init__.py @@ -124,7 +124,8 @@ def load( # noqa: PLR0912 Too many branches next_byte = file.read(1) if next_byte == b"": - raise RuntimeError(f"Unsupported image format {magic_number!r}") + # mpy-cross does not support !r in f-string substitution, so ignore ruff rule + raise RuntimeError("Unsupported image format {!r}".format(magic_number)) # noqa: UP032, f-string if next_byte == b"#": # comment found, seek until a newline or EOF is found while file.read(1) not in [b"", b"\n"]: # EOF or NL pass From 56a964448b50c794bfeb1bbad5cc09510d175164 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Sun, 11 Aug 2024 14:38:59 -0500 Subject: [PATCH 17/59] add image files --- examples/images/test_image_2bit.png | Bin 0 -> 624 bytes examples/images/test_image_grayscale.png | Bin 0 -> 10556 bytes examples/images/test_image_rgb.png | Bin 0 -> 7565 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/images/test_image_2bit.png create mode 100644 examples/images/test_image_grayscale.png create mode 100644 examples/images/test_image_rgb.png diff --git a/examples/images/test_image_2bit.png b/examples/images/test_image_2bit.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7d8ca6d34bc28d78ad05ba1828bd52f6d050bf GIT binary patch literal 624 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 A6#xJL literal 0 HcmV?d00001 diff --git a/examples/images/test_image_rgb.png b/examples/images/test_image_rgb.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c209b4e4777f50dd0c3821959fa5766c7d27e2 GIT binary patch literal 7565 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 literal 0 HcmV?d00001 From c10b95abd5820b7c031b35c3d905a1a7a3f2f96e Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 12 Aug 2024 14:58:16 -0500 Subject: [PATCH 18/59] remove images --- examples/images/test_image_2bit.png | Bin 624 -> 0 bytes examples/images/test_image_grayscale.png | Bin 10556 -> 0 bytes examples/images/test_image_rgb.png | Bin 7565 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 examples/images/test_image_2bit.png delete mode 100644 examples/images/test_image_grayscale.png delete mode 100644 examples/images/test_image_rgb.png diff --git a/examples/images/test_image_2bit.png b/examples/images/test_image_2bit.png deleted file mode 100644 index 6c7d8ca6d34bc28d78ad05ba1828bd52f6d050bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 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 A6#xJL diff --git a/examples/images/test_image_rgb.png b/examples/images/test_image_rgb.png deleted file mode 100644 index f6c209b4e4777f50dd0c3821959fa5766c7d27e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7565 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 From 983ae118640e4aef62b4af18bd9793bb80330118 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 12 Aug 2024 14:59:10 -0500 Subject: [PATCH 19/59] add images back --- examples/images/test_image_2bit.png | Bin 0 -> 624 bytes examples/images/test_image_grayscale.png | Bin 0 -> 10556 bytes examples/images/test_image_rgb.png | Bin 0 -> 7565 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/images/test_image_2bit.png create mode 100644 examples/images/test_image_grayscale.png create mode 100644 examples/images/test_image_rgb.png diff --git a/examples/images/test_image_2bit.png b/examples/images/test_image_2bit.png new file mode 100644 index 0000000000000000000000000000000000000000..6c7d8ca6d34bc28d78ad05ba1828bd52f6d050bf GIT binary patch literal 624 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 A6#xJL literal 0 HcmV?d00001 diff --git a/examples/images/test_image_rgb.png b/examples/images/test_image_rgb.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c209b4e4777f50dd0c3821959fa5766c7d27e2 GIT binary patch literal 7565 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 literal 0 HcmV?d00001 From 5e6fcd5a3aa38ef57d276f01abe321924e5dc95b Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 12 Aug 2024 15:29:07 -0500 Subject: [PATCH 20/59] remove images --- examples/images/test_image_2bit.png | Bin 624 -> 0 bytes examples/images/test_image_grayscale.png | Bin 10556 -> 0 bytes examples/images/test_image_rgb.png | Bin 7565 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 examples/images/test_image_2bit.png delete mode 100644 examples/images/test_image_grayscale.png delete mode 100644 examples/images/test_image_rgb.png diff --git a/examples/images/test_image_2bit.png b/examples/images/test_image_2bit.png deleted file mode 100644 index 6c7d8ca6d34bc28d78ad05ba1828bd52f6d050bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 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 A6#xJL diff --git a/examples/images/test_image_rgb.png b/examples/images/test_image_rgb.png deleted file mode 100644 index f6c209b4e4777f50dd0c3821959fa5766c7d27e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7565 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 From 5801433e6ba64886e6a376e81322047f22b45dc7 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 12 Aug 2024 15:29:29 -0500 Subject: [PATCH 21/59] remove gitattr --- .gitattributes | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index d54c593..0000000 --- a/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Justin Myers for Adafruit Industries -# -# SPDX-License-Identifier: Unlicense - -* text eol=lf From f5fb63da6a616a3ebd31428b515459dd871aac68 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 12 Aug 2024 15:33:38 -0500 Subject: [PATCH 22/59] add images --- examples/images/test_image_2bit.png | Bin 0 -> 625 bytes examples/images/test_image_grayscale.png | Bin 0 -> 10557 bytes examples/images/test_image_rgb.png | Bin 0 -> 7566 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 examples/images/test_image_2bit.png create mode 100644 examples/images/test_image_grayscale.png create mode 100644 examples/images/test_image_rgb.png diff --git a/examples/images/test_image_2bit.png b/examples/images/test_image_2bit.png new file mode 100644 index 0000000000000000000000000000000000000000..9cc741621c8bd913c54d1e28ba4d5553a85caabd GIT binary patch literal 625 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 AA^-pY literal 0 HcmV?d00001 diff --git a/examples/images/test_image_rgb.png b/examples/images/test_image_rgb.png new file mode 100644 index 0000000000000000000000000000000000000000..975fe89cd7e77eeb8826bccc3eeebc9c5b8159c7 GIT binary patch literal 7566 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 Date: Mon, 7 Oct 2024 09:24:05 -0500 Subject: [PATCH 23/59] remove deprecated get_html_theme_path() call Signed-off-by: foamyguy --- docs/conf.py | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 7e8361c..15c9fc0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -100,7 +100,6 @@ import sphinx_rtd_theme html_theme = "sphinx_rtd_theme" -html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."] # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, From f33b92a9612a7ccbeaec72b43eecc24bf1cb51c3 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 7 Oct 2024 19:30:54 -0400 Subject: [PATCH 24/59] fix PNG images wider than 128 bits --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 84867b9..a78936c 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -110,7 +110,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - if depth < 8: + if depth < 8 or width > 128: # Work around the bug in displayio.Bitmap # https://github.com/adafruit/circuitpython/issues/6675 pixels_per_byte = 8 // depth From 3938d4ca91679eb3f5bd427fef5fba9314566785 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Wed, 9 Oct 2024 22:17:01 -0400 Subject: [PATCH 25/59] apply #74 workaround to all 8 bit mode 3 images --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index a78936c..d110938 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -110,7 +110,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - if depth < 8 or width > 128: + if depth <= 8: # Work around the bug in displayio.Bitmap # https://github.com/adafruit/circuitpython/issues/6675 pixels_per_byte = 8 // depth From 204d8b09759059ff5a8bac65f85e5747f739a8fd Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 01:16:27 -0400 Subject: [PATCH 26/59] Use memoryview for bitmap widths that it works for --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index d110938..e911287 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -110,7 +110,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - if depth <= 8: + if depth < 8 or (depth == 8 and width % 4 != 0): # Work around the bug in displayio.Bitmap # https://github.com/adafruit/circuitpython/issues/6675 pixels_per_byte = 8 // depth From 949ff2dbc081aab509f6137e6ab7925ae939642c Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 01:44:46 -0400 Subject: [PATCH 27/59] remove portion of workaround for resolved bug --- adafruit_imageload/png.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index e911287..1c5f323 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -110,9 +110,11 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - if depth < 8 or (depth == 8 and width % 4 != 0): - # Work around the bug in displayio.Bitmap + if width % 4 != 0: + # Work around the bugs in displayio.Bitmap + # The first should have been resolved by #9479 # https://github.com/adafruit/circuitpython/issues/6675 + # https://github.com/adafruit/circuitpython/issues/9707 pixels_per_byte = 8 // depth for x in range(0, width, pixels_per_byte): byte = data_bytes[src] From 77136895d68d0cac7f97550c0a93d18824b3e50a Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 02:40:05 -0400 Subject: [PATCH 28/59] workaround still needed for all 4 bit or less images --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 1c5f323..68a8d8e 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -110,7 +110,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for y in range(height): dst = y * scanline src = y * (scanline + 1) + 1 - if width % 4 != 0: + if depth < 5 or width % 4 != 0: # Work around the bugs in displayio.Bitmap # The first should have been resolved by #9479 # https://github.com/adafruit/circuitpython/issues/6675 From 42cfb2b693d7951216914628706a36a295e4902e Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 03:15:28 -0400 Subject: [PATCH 29/59] Identified issue with memoryview copy, only 4bit and less need workaround now --- adafruit_imageload/png.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 68a8d8e..094b962 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -108,9 +108,11 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements bmp = bitmap(width, height, colors) mem = memoryview(bmp) for y in range(height): - dst = y * scanline + # Adjust for Displayio.Bitmap filler to scanline at byte boundry + filladj = (y * ((4 - (width % 4)) % 4)) + dst = y * scanline + filladj src = y * (scanline + 1) + 1 - if depth < 5 or width % 4 != 0: + if depth < 5: # Work around the bugs in displayio.Bitmap # The first should have been resolved by #9479 # https://github.com/adafruit/circuitpython/issues/6675 From dde5d395276ff935d7b65860bcb7ab4432024627 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 03:27:03 -0400 Subject: [PATCH 30/59] pre-commit formatting --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 094b962..d4e8c2d 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -109,7 +109,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements mem = memoryview(bmp) for y in range(height): # Adjust for Displayio.Bitmap filler to scanline at byte boundry - filladj = (y * ((4 - (width % 4)) % 4)) + filladj = y * ((4 - (width % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 if depth < 5: From 296bacd6771849dae5f6c428b72d0597f965fc40 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 03:58:40 -0400 Subject: [PATCH 31/59] Use work around for <8 depth for now --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index d4e8c2d..83e2d36 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -112,7 +112,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements filladj = y * ((4 - (width % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 - if depth < 5: + if depth < 8: # Work around the bugs in displayio.Bitmap # The first should have been resolved by #9479 # https://github.com/adafruit/circuitpython/issues/6675 From f931aeefe2fec715dc55e25d8f2afd60d611084f Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 04:00:11 -0400 Subject: [PATCH 32/59] comment fix --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 83e2d36..0156ee3 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -108,7 +108,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements bmp = bitmap(width, height, colors) mem = memoryview(bmp) for y in range(height): - # Adjust for Displayio.Bitmap filler to scanline at byte boundry + # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry filladj = y * ((4 - (width % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 From 9637b47b847e28436277733f336efd964dd3841b Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 04:20:07 -0400 Subject: [PATCH 33/59] finally, remove workaround code --- adafruit_imageload/png.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 0156ee3..b4d73cd 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -109,24 +109,10 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements mem = memoryview(bmp) for y in range(height): # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry - filladj = y * ((4 - (width % 4)) % 4) + filladj = y * ((4 - (scanline % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 - if depth < 8: - # Work around the bugs in displayio.Bitmap - # The first should have been resolved by #9479 - # https://github.com/adafruit/circuitpython/issues/6675 - # https://github.com/adafruit/circuitpython/issues/9707 - pixels_per_byte = 8 // depth - for x in range(0, width, pixels_per_byte): - byte = data_bytes[src] - for pixel in range(pixels_per_byte): - bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( - (1 << depth) - 1 - ) - src += 1 - else: - mem[dst : dst + scanline] = data_bytes[src : src + scanline] + mem[dst : dst + scanline] = data_bytes[src : src + scanline] return bmp, pal # RGB, RGBA or Grayscale import displayio From 82c08417986b0c20771a44399a5ad894020c1552 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 12:24:14 -0400 Subject: [PATCH 34/59] workaound left in as comments for documentation --- adafruit_imageload/png.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index b4d73cd..5cf9d54 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -112,6 +112,21 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements filladj = y * ((4 - (scanline % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 + # Work around the bug in displayio.Bitmap - removed afer resolution + # however left here as comments because it's helpful in + # understanding the memoryview scanline and adjustment calculations + # https://github.com/adafruit/circuitpython/issues/6675 + # https://github.com/adafruit/circuitpython/issues/9707 + # + # pixels_per_byte = 8 // depth + # for x in range(0, width, pixels_per_byte): + # byte = data_bytes[src] + # for pixel in range(pixels_per_byte): + # bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( + # (1 << depth) - 1 + # ) + # src += 1 + # mem[dst : dst + scanline] = data_bytes[src : src + scanline] return bmp, pal # RGB, RGBA or Grayscale From c23d7364eddb666b69193bd94c0993543aa1e5b5 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 22:25:23 -0400 Subject: [PATCH 35/59] Use workaround for older versions of CircuitPython --- adafruit_imageload/png.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 5cf9d54..8d36fbc 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -25,6 +25,7 @@ except ImportError: pass +from sys import implementation import struct import zlib @@ -112,22 +113,23 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements filladj = y * ((4 - (scanline % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 - # Work around the bug in displayio.Bitmap - removed afer resolution - # however left here as comments because it's helpful in - # understanding the memoryview scanline and adjustment calculations + # Work around the bug in displayio.Bitmap + # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 # https://github.com/adafruit/circuitpython/issues/9707 - # - # pixels_per_byte = 8 // depth - # for x in range(0, width, pixels_per_byte): - # byte = data_bytes[src] - # for pixel in range(pixels_per_byte): - # bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( - # (1 << depth) - 1 - # ) - # src += 1 - # - mem[dst : dst + scanline] = data_bytes[src : src + scanline] + if ((implementation[1][0] == 9 and implementation[1][1] < 2) or + implementation[1][0] < 9) and (depth < 8 or width % 4 != 0): + + pixels_per_byte = 8 // depth + for x in range(0, width, pixels_per_byte): + byte = data_bytes[src] + for pixel in range(pixels_per_byte): + bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( + (1 << depth) - 1 + ) + src += 1 + else: + mem[dst : dst + scanline] = data_bytes[src : src + scanline] return bmp, pal # RGB, RGBA or Grayscale import displayio From 20d7a15655eb4f563edda7c2e67e47680e60a6fb Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 22:28:43 -0400 Subject: [PATCH 36/59] pre-commit formatting --- adafruit_imageload/png.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 8d36fbc..1854e04 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -117,9 +117,9 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 # https://github.com/adafruit/circuitpython/issues/9707 - if ((implementation[1][0] == 9 and implementation[1][1] < 2) or - implementation[1][0] < 9) and (depth < 8 or width % 4 != 0): - + if ( + (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 + ) and (depth < 8 or width % 4 != 0): pixels_per_byte = 8 // depth for x in range(0, width, pixels_per_byte): byte = data_bytes[src] From 1b6ebf7e0928f3f0ec0fd2c2abc20646029adbf9 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Thu, 10 Oct 2024 22:32:59 -0400 Subject: [PATCH 37/59] move import for pre-commmit --- adafruit_imageload/png.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 1854e04..7374f92 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -25,9 +25,9 @@ except ImportError: pass -from sys import implementation import struct import zlib +from sys import implementation __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" @@ -113,13 +113,13 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements filladj = y * ((4 - (scanline % 4)) % 4) dst = y * scanline + filladj src = y * (scanline + 1) + 1 - # Work around the bug in displayio.Bitmap - # remove once CircuitPython 9.1 is no longer supported - # https://github.com/adafruit/circuitpython/issues/6675 - # https://github.com/adafruit/circuitpython/issues/9707 if ( (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 ) and (depth < 8 or width % 4 != 0): + # Work around the bug in displayio.Bitmap + # remove once CircuitPython 9.1 is no longer supported + # https://github.com/adafruit/circuitpython/issues/6675 + # https://github.com/adafruit/circuitpython/issues/9707 pixels_per_byte = 8 // depth for x in range(0, width, pixels_per_byte): byte = data_bytes[src] From 12f4cdccf9f13c9647e1e06acb77c55f95ebb132 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 11 Oct 2024 00:19:26 -0400 Subject: [PATCH 38/59] minor speed up when using workaround code --- adafruit_imageload/png.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 7374f92..6be3650 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -109,9 +109,6 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements bmp = bitmap(width, height, colors) mem = memoryview(bmp) for y in range(height): - # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry - filladj = y * ((4 - (scanline % 4)) % 4) - dst = y * scanline + filladj src = y * (scanline + 1) + 1 if ( (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 @@ -129,6 +126,9 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements ) src += 1 else: + # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry + filladj = y * ((4 - (scanline % 4)) % 4) + dst = y * scanline + filladj mem[dst : dst + scanline] = data_bytes[src : src + scanline] return bmp, pal # RGB, RGBA or Grayscale From 392007ca6b6921eb351a3e478d4dbe3b07dc01fa Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 11 Oct 2024 02:21:37 -0400 Subject: [PATCH 39/59] speed optimizations --- adafruit_imageload/png.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 6be3650..2c2f387 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -108,8 +108,13 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements if mode == 3: # indexed bmp = bitmap(width, height, colors) mem = memoryview(bmp) + pixels_per_byte = 8 // depth + # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry + filladj = (4 - (scanline % 4)) % 4 + dst = 0 + src = 1 + src_b = 1 for y in range(height): - src = y * (scanline + 1) + 1 if ( (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 ) and (depth < 8 or width % 4 != 0): @@ -117,19 +122,18 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 # https://github.com/adafruit/circuitpython/issues/9707 - pixels_per_byte = 8 // depth for x in range(0, width, pixels_per_byte): - byte = data_bytes[src] + byte = data_bytes[src_b] for pixel in range(pixels_per_byte): bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( (1 << depth) - 1 ) - src += 1 + src_b += 1 else: - # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry - filladj = y * ((4 - (scanline % 4)) % 4) - dst = y * scanline + filladj mem[dst : dst + scanline] = data_bytes[src : src + scanline] + dst += scanline + filladj + src += scanline + 1 + src_b = src return bmp, pal # RGB, RGBA or Grayscale import displayio From c491b815814c2885311150aff9edac0b564d20a5 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 11 Oct 2024 02:26:10 -0400 Subject: [PATCH 40/59] one more minor optimization --- adafruit_imageload/png.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 2c2f387..b31a88f 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -114,10 +114,15 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements dst = 0 src = 1 src_b = 1 + if ( + (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 + ) and (depth < 8 or width % 4 != 0): + workaround = True + else: + workaround = False + for y in range(height): - if ( - (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 - ) and (depth < 8 or width % 4 != 0): + if (workaround): # Work around the bug in displayio.Bitmap # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 From 3dbc21df315be6ceb7c15d3f3efe43dd945cce2f Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Fri, 11 Oct 2024 02:32:51 -0400 Subject: [PATCH 41/59] I even ran pre-commit this time.... --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index b31a88f..d4f9c70 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -122,7 +122,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements workaround = False for y in range(height): - if (workaround): + if workaround: # Work around the bug in displayio.Bitmap # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 From d22ccf5431ed29762347b77d6b29c7ab9589a0ee Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 14 Oct 2024 22:47:21 -0400 Subject: [PATCH 42/59] deshipus optimization --- adafruit_imageload/png.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index d4f9c70..0f85bd6 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -111,18 +111,12 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements pixels_per_byte = 8 // depth # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry filladj = (4 - (scanline % 4)) % 4 - dst = 0 src = 1 - src_b = 1 if ( (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 ) and (depth < 8 or width % 4 != 0): - workaround = True - else: - workaround = False - - for y in range(height): - if workaround: + src_b = 1 + for y in range(height): # Work around the bug in displayio.Bitmap # remove once CircuitPython 9.1 is no longer supported # https://github.com/adafruit/circuitpython/issues/6675 @@ -134,11 +128,14 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements (1 << depth) - 1 ) src_b += 1 - else: + src += scanline + 1 + src_b = src + else: + dst = 0 + for y in range(height): mem[dst : dst + scanline] = data_bytes[src : src + scanline] dst += scanline + filladj - src += scanline + 1 - src_b = src + src += scanline + 1 return bmp, pal # RGB, RGBA or Grayscale import displayio From 66fa04d45b0c3b2f7657d48bfbaef6a8ef006026 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 14 Oct 2024 22:54:12 -0400 Subject: [PATCH 43/59] Move workaround comment to top of workaround --- adafruit_imageload/png.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 0f85bd6..72a6e0a 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -115,12 +115,12 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements if ( (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 ) and (depth < 8 or width % 4 != 0): + # Work around the bug in displayio.Bitmap + # remove once CircuitPython 9.1 is no longer supported + # https://github.com/adafruit/circuitpython/issues/6675 + # https://github.com/adafruit/circuitpython/issues/9707 src_b = 1 for y in range(height): - # Work around the bug in displayio.Bitmap - # remove once CircuitPython 9.1 is no longer supported - # https://github.com/adafruit/circuitpython/issues/6675 - # https://github.com/adafruit/circuitpython/issues/9707 for x in range(0, width, pixels_per_byte): byte = data_bytes[src_b] for pixel in range(pixels_per_byte): From 872e1819bdd2cbb7d12f2ad0f388a2f4420eeda0 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 15 Oct 2024 01:46:18 -0400 Subject: [PATCH 44/59] Remove memoryview copy method --- adafruit_imageload/png.py | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 72a6e0a..31fda8a 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -104,38 +104,22 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements data_bytes = zlib.decompress(data) unit = (1, 0, 3, 1, 2, 0, 4)[mode] scanline = (width * depth * unit + 7) // 8 - colors = 1 << (depth * unit) if mode == 3: # indexed - bmp = bitmap(width, height, colors) - mem = memoryview(bmp) + bmp = bitmap(width, height, 1 << depth) pixels_per_byte = 8 // depth # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry filladj = (4 - (scanline % 4)) % 4 src = 1 - if ( - (implementation[1][0] == 9 and implementation[1][1] < 2) or implementation[1][0] < 9 - ) and (depth < 8 or width % 4 != 0): - # Work around the bug in displayio.Bitmap - # remove once CircuitPython 9.1 is no longer supported - # https://github.com/adafruit/circuitpython/issues/6675 - # https://github.com/adafruit/circuitpython/issues/9707 - src_b = 1 - for y in range(height): - for x in range(0, width, pixels_per_byte): - byte = data_bytes[src_b] - for pixel in range(pixels_per_byte): - bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & ( - (1 << depth) - 1 - ) - src_b += 1 - src += scanline + 1 - src_b = src - else: - dst = 0 - for y in range(height): - mem[dst : dst + scanline] = data_bytes[src : src + scanline] - dst += scanline + filladj - src += scanline + 1 + src_b = 1 + pixmask = (1 << depth) - 1 + for y in range(height): + for x in range(0, width, pixels_per_byte): + byte = data_bytes[src_b] + for pixel in range(pixels_per_byte): + bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & pixmask + src_b += 1 + src += scanline + 1 + src_b = src return bmp, pal # RGB, RGBA or Grayscale import displayio From 0132c78b7af36f20aad60b44b0c2925c9f7e6b83 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 15 Oct 2024 01:51:57 -0400 Subject: [PATCH 45/59] remove memoryview adjust variable --- adafruit_imageload/png.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 31fda8a..d08956e 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -107,8 +107,6 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements if mode == 3: # indexed bmp = bitmap(width, height, 1 << depth) pixels_per_byte = 8 // depth - # Adjust for Displayio.Bitmap filler to scanline at 4-byte boundry - filladj = (4 - (scanline % 4)) % 4 src = 1 src_b = 1 pixmask = (1 << depth) - 1 From bd38609c670fe8aca5e8a7e009c6a79365c0beb6 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 15 Oct 2024 15:42:39 -0400 Subject: [PATCH 46/59] remove sys.implementation import --- adafruit_imageload/png.py | 1 - 1 file changed, 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index d08956e..89a9ded 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -27,7 +27,6 @@ import struct import zlib -from sys import implementation __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" From b164009110884c26a2e5792dccaff5347ce45554 Mon Sep 17 00:00:00 2001 From: Shawn McGee Date: Sun, 3 Nov 2024 21:16:23 -0700 Subject: [PATCH 47/59] Fixed truecolor bmp not using provided bitmap constructor --- adafruit_imageload/bmp/truecolor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/bmp/truecolor.py b/adafruit_imageload/bmp/truecolor.py index 1e6dccd..fe4baac 100755 --- a/adafruit_imageload/bmp/truecolor.py +++ b/adafruit_imageload/bmp/truecolor.py @@ -94,7 +94,7 @@ def load( # noqa: PLR0912, PLR0913, Too many branches, Too many arguments in fu # convert unsigned int to signed int when height is negative height = negative_height_check(height) - bitmap_obj = Bitmap(width, abs(height), 65535) + bitmap_obj = bitmap(width, abs(height), 65535) file.seek(data_start) line_size = width * (color_depth // 8) # Set the seek direction based on whether the height value is negative or positive From 7936be32bc5066307c1721b57d4ff8ce6f9b1ff4 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 7 Nov 2024 16:43:40 -0600 Subject: [PATCH 48/59] show ColorConverter in type annotation --- adafruit_imageload/__init__.py | 4 ++-- adafruit_imageload/bmp/__init__.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_imageload/__init__.py b/adafruit_imageload/__init__.py index bf7d3e2..e149c41 100644 --- a/adafruit_imageload/__init__.py +++ b/adafruit_imageload/__init__.py @@ -24,7 +24,7 @@ Union, ) - from displayio import Bitmap, Palette + from displayio import Bitmap, ColorConverter, Palette from .displayio_types import BitmapConstructor, PaletteConstructor except ImportError: @@ -39,7 +39,7 @@ def load( *, bitmap: Optional[BitmapConstructor] = None, palette: Optional[PaletteConstructor] = None, -) -> Tuple[Bitmap, Optional[Palette]]: +) -> Tuple[Bitmap, Optional[Union[Palette, ColorConverter]]]: """Load pixel values (indices or colors) into a bitmap and colors into a palette. bitmap is the desired type. It must take width, height and color_depth in the constructor. It diff --git a/adafruit_imageload/bmp/__init__.py b/adafruit_imageload/bmp/__init__.py index d7b9801..715e98b 100755 --- a/adafruit_imageload/bmp/__init__.py +++ b/adafruit_imageload/bmp/__init__.py @@ -15,9 +15,9 @@ try: from io import BufferedReader - from typing import List, Optional, Set, Tuple + from typing import List, Optional, Set, Tuple, Union - from displayio import Bitmap, Palette + from displayio import Bitmap, ColorConverter, Palette from ..displayio_types import BitmapConstructor, PaletteConstructor except ImportError: @@ -32,7 +32,7 @@ def load( *, bitmap: Optional[BitmapConstructor] = None, palette: Optional[PaletteConstructor] = None, -) -> Tuple[Optional[Bitmap], Optional[Palette]]: +) -> Tuple[Optional[Bitmap], Optional[Union[Palette, ColorConverter]]]: """Loads a bmp image from the open ``file``. Returns tuple of bitmap object and palette object. From 04bdc7d5103232cacc9ff7ec8b79d3094a371f12 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Thu, 7 Nov 2024 16:48:33 -0600 Subject: [PATCH 49/59] show ColorConverter in docstring --- adafruit_imageload/bmp/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/bmp/__init__.py b/adafruit_imageload/bmp/__init__.py index 715e98b..5c9c1df 100755 --- a/adafruit_imageload/bmp/__init__.py +++ b/adafruit_imageload/bmp/__init__.py @@ -35,7 +35,8 @@ def load( ) -> Tuple[Optional[Bitmap], Optional[Union[Palette, ColorConverter]]]: """Loads a bmp image from the open ``file``. - Returns tuple of bitmap object and palette object. + Returns tuple of `displayio.Bitmap` object and + `displayio.Palette` object, or `displayio.ColorConverter` object. :param io.BufferedReader file: Open file handle or compatible (like `io.BytesIO`) with the data of a BMP file. From 519d5f7af9dfdfe9444f2b358703dbdbc1243f78 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 14 Jan 2025 16:25:25 -0600 Subject: [PATCH 50/59] move prev,line swap to after putting data into bitmap --- adafruit_imageload/png.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 89a9ded..010dff3 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -168,7 +168,6 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements src += 1 else: raise ValueError("Wrong filter.") - prev, line = line, prev if mode in (0, 4): # grayscale for x in range(width): c = line[x * unit] @@ -180,5 +179,8 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements ) else: raise ValueError("Unsupported color mode.") + + prev, line = line, prev + pal = displayio.ColorConverter(input_colorspace=displayio.Colorspace.RGB565) return bmp, pal From 3bf2a56c6c281dffa6f2590d6d0b9d6d6f45d355 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 14 Jan 2025 11:32:34 -0600 Subject: [PATCH 51/59] add sphinx configuration to rtd.yaml Signed-off-by: foamyguy --- .readthedocs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 33c2a61..88bca9f 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,6 +8,9 @@ # Required version: 2 +sphinx: + configuration: docs/conf.py + build: os: ubuntu-20.04 tools: From bf6f32d392573ed33ecc43e8f62a289f3ceca758 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 17 Jan 2025 10:20:08 -0600 Subject: [PATCH 52/59] load png test case --- tests/test_png.png | Bin 0 -> 571 bytes tests/test_png.png.license | 2 ++ tests/test_png_load.py | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 tests/test_png.png create mode 100644 tests/test_png.png.license create mode 100644 tests/test_png_load.py diff --git a/tests/test_png.png b/tests/test_png.png new file mode 100644 index 0000000000000000000000000000000000000000..314173af2fe07661454dcf2fc3fda8366117de38 GIT binary patch literal 571 zcmV-B0>u4^P)EX>4Tx04R}tkv&MmP!xqvTcsi`B6d)52w0u$q9Ts93Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mg7n~Gbq{RD@LW>wLJl@B7_Z;545AZiCOf|dWfT~$W zI++l%xm6+f3Lp9r#t=p&X6kdIn1W}0-BUN!U5saW_x)L6C2umoClJS(Zdk+{#50?g z&Uv3W!b*}td`>)J&;^Mfxh}i>#<}RQpJzslOnRO;LM#+JSngm}GF0Me;;5o(l<&{F ztZ?4qtX68Qbx;1nP+nVE<~pqrB(aDkh!7y7hB7L!5Tjiq#YCFU6CVCy$1jpgCRZ7Z z91EyIh2;3b|KRs*&BD~An-od_-7mKNF$M&8fo9#dzmILZc>)BUfh(=;uQq_$Ptxmc zEqVm>Z37qAZB5<-E_Z;zCtWfmM+(sL7Ye}p8GTa@7`O#`*W9_a&T;wxWN22Y8{ps& z7%x)xy2rbFI_LIpPiuZZgLQJP;t&>p00009P)t-s00960000300A{uIP5=M^32;bR za{vG?BLDy{BLR4&KXw2B00(qQO+^Rk0TB=cG;ySBVE_OC8FWQhbVF}#ZDnqB07G(R zVRU6=Aa`kWXdp*PO;A^X4i^9b01!z;K~xCWV^Cr6WSGRD0ssU{0VHZfD^vgg002ov JPDHLkV1lOI;%5K= literal 0 HcmV?d00001 diff --git a/tests/test_png.png.license b/tests/test_png.png.license new file mode 100644 index 0000000..beff0b4 --- /dev/null +++ b/tests/test_png.png.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2025 Tim Cocks for Adafruit Industries +# SPDX-License-Identifier: MIT diff --git a/tests/test_png_load.py b/tests/test_png_load.py new file mode 100644 index 0000000..78e0a1c --- /dev/null +++ b/tests/test_png_load.py @@ -0,0 +1,24 @@ +# SPDX-FileCopyrightText: 2025 Tim Cocks for Adafruit Industries +# SPDX-License-Identifier: MIT + +from unittest import TestCase + +from adafruit_imageload import load + + +class TestPngLoad(TestCase): + def test_expected_pixels(self): + img, palette = load("tests/test_png.png") + self.assertEqual(len(palette), 3) + self.assertEqual(img.width, 4) + self.assertEqual(img.height, 4) + + self.assertEqual(img[0, 0], 0) + self.assertEqual(img[1, 0], 2) + self.assertEqual(img[2, 0], 1) + self.assertEqual(img[3, 0], 0) + + self.assertEqual(img[0, 3], 0) + self.assertEqual(img[1, 3], 2) + self.assertEqual(img[2, 3], 1) + self.assertEqual(img[3, 3], 0) From 92f5030b799f6020fedee4405064884b3fd1051d Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 17 Feb 2025 10:48:18 -0600 Subject: [PATCH 53/59] dont try to set pixels outside of bounds --- adafruit_imageload/png.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index 010dff3..0c5892f 100644 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -113,7 +113,10 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements for x in range(0, width, pixels_per_byte): byte = data_bytes[src_b] for pixel in range(pixels_per_byte): - bmp[x + pixel, y] = (byte >> ((pixels_per_byte - pixel - 1) * depth)) & pixmask + if x + pixel < width: + bmp[x + pixel, y] = ( + byte >> ((pixels_per_byte - pixel - 1) * depth) + ) & pixmask src_b += 1 src += scanline + 1 src_b = src From 4223574348fbe7abb6904982a435657f6760f8e4 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Fri, 21 Feb 2025 16:05:17 +0100 Subject: [PATCH 54/59] implement line filters for indexed PNG --- adafruit_imageload/png.py | 44 +++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) mode change 100644 => 100755 adafruit_imageload/png.py diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py old mode 100644 new mode 100755 index 0c5892f..b00ee9d --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -28,7 +28,7 @@ import struct import zlib -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad.git" @@ -106,12 +106,48 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements if mode == 3: # indexed bmp = bitmap(width, height, 1 << depth) pixels_per_byte = 8 // depth - src = 1 - src_b = 1 + src = 0 pixmask = (1 << depth) - 1 + line = bytearray(scanline) + prev = bytearray(scanline) for y in range(height): + filter_ = data_bytes[src] + src_b = src + 1 for x in range(0, width, pixels_per_byte): + # relative position on the line + pos = x // pixels_per_byte byte = data_bytes[src_b] + if filter_ == 0: + pass + elif filter_ == 1: # sub + prev_b = line[pos - unit] if pos >= unit else 0 + byte = (byte + prev_b) & 0xFF + elif filter_ == 2: # up + byte = (byte + prev[pos]) & 0xFF + elif filter_ == 3: # average + prev_b = line[pos - unit] if pos >= unit else 0 + byte = (byte + (prev_b + prev[pos]) // 2) & 0xFF + elif filter_ == 4: # paeth + a = line[pos - unit] if pos >= unit else 0 + if y > 0: + b = prev[pos] + c = prev[pos - unit] if pos >= unit else 0 + else: + b = c = 0 + p = a + b - c + pa = abs(p - a) + pb = abs(p - b) + pc = abs(p - c) + if pa <= pb and pa <= pc: + p = a + elif pb <= pc: + p = b + else: + p = c + byte = (data_bytes[src] + p) & 0xFF + else: + raise ValueError("Wrong filter.") + line[pos] = byte for pixel in range(pixels_per_byte): if x + pixel < width: bmp[x + pixel, y] = ( @@ -119,7 +155,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements ) & pixmask src_b += 1 src += scanline + 1 - src_b = src + prev, line = line, prev return bmp, pal # RGB, RGBA or Grayscale import displayio From 790497ee21c1025499850a3507fa2c844689817f Mon Sep 17 00:00:00 2001 From: Neradoc Date: Fri, 21 Feb 2025 16:25:07 +0100 Subject: [PATCH 55/59] fix paeth --- adafruit_imageload/png.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_imageload/png.py b/adafruit_imageload/png.py index b00ee9d..215e313 100755 --- a/adafruit_imageload/png.py +++ b/adafruit_imageload/png.py @@ -144,7 +144,7 @@ def load( # noqa: PLR0912, PLR0915, Too many branches, Too many statements p = b else: p = c - byte = (data_bytes[src] + p) & 0xFF + byte = (byte + p) & 0xFF else: raise ValueError("Wrong filter.") line[pos] = byte From 961c433f85f4575c7bc109aedf9c13915bc67a50 Mon Sep 17 00:00:00 2001 From: Justin Myers Date: Thu, 27 Feb 2025 15:41:14 -0800 Subject: [PATCH 56/59] Remove secrets usage --- examples/imageload_from_web.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/examples/imageload_from_web.py b/examples/imageload_from_web.py index 9a873a8..79c78dd 100644 --- a/examples/imageload_from_web.py +++ b/examples/imageload_from_web.py @@ -5,34 +5,32 @@ adafruit_requests using BytesIO """ -import ssl from io import BytesIO +from os import getenv +import adafruit_connection_manager import adafruit_requests as requests import board import displayio -import socketpool import wifi import adafruit_imageload -# Get wifi details and more from a secrets.py file -try: - from secrets import secrets -except ImportError: - print("WiFi secrets are kept in secrets.py, please add them there!") - raise +# Get WiFi details, ensure these are setup in settings.toml +ssid = getenv("CIRCUITPY_WIFI_SSID") +password = getenv("CIRCUITPY_WIFI_PASSWORD") -wifi.radio.connect(secrets["ssid"], secrets["password"]) +wifi.radio.connect(ssid, password) print("My IP address is", wifi.radio.ipv4_address) -socket = socketpool.SocketPool(wifi.radio) -https = requests.Session(socket, ssl.create_default_context()) +pool = adafruit_connection_manager.get_radio_socketpool(wifi.radio) +ssl_context = adafruit_connection_manager.get_radio_ssl_context(wifi.radio) +https = requests.Session(pool, ssl_context) url = "https://raw.githubusercontent.com/adafruit/Adafruit_CircuitPython_ImageLoad/main/examples/images/4bit.bmp" -print("Fetching text from %s" % url) +print(f"Fetching text from {url}") response = https.get(url) print("GET complete") From 23f7866f2e69fbf9af54a0b9094ee3db53611b38 Mon Sep 17 00:00:00 2001 From: Karolis Stasaitis Date: Wed, 9 Apr 2025 22:22:41 +0200 Subject: [PATCH 57/59] fix padded pbm binary loading --- adafruit_imageload/pnm/pbm_binary.py | 6 +++-- examples/images/netpbm_p4_mono_width.pbm | 3 +++ .../images/netpbm_p4_mono_width.pbm.license | 2 ++ tests/test_pbm_load.py | 23 ++++++++++++++++++- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 examples/images/netpbm_p4_mono_width.pbm create mode 100644 examples/images/netpbm_p4_mono_width.pbm.license diff --git a/adafruit_imageload/pnm/pbm_binary.py b/adafruit_imageload/pnm/pbm_binary.py index cecdba5..53d92df 100644 --- a/adafruit_imageload/pnm/pbm_binary.py +++ b/adafruit_imageload/pnm/pbm_binary.py @@ -38,6 +38,7 @@ def load( """ Load a P4 'PBM' binary image into the Bitmap """ + padded_width = (width + 7) // 8 * 8 x = 0 y = 0 while True: @@ -45,9 +46,10 @@ def load( if not next_byte: break # out of bits for bit in iterbits(next_byte): - bitmap[x, y] = bit + if x < width: + bitmap[x, y] = bit x += 1 - if x > width - 1: + if x > padded_width - 1: y += 1 x = 0 if y > height - 1: diff --git a/examples/images/netpbm_p4_mono_width.pbm b/examples/images/netpbm_p4_mono_width.pbm new file mode 100644 index 0000000..ef6a9e6 --- /dev/null +++ b/examples/images/netpbm_p4_mono_width.pbm @@ -0,0 +1,3 @@ +P4 +14 20 +ÏÌ·´·´·´·´·´·´·´·´{x|øøg˜Cøø{x¼ôßìà \ No newline at end of file diff --git a/examples/images/netpbm_p4_mono_width.pbm.license b/examples/images/netpbm_p4_mono_width.pbm.license new file mode 100644 index 0000000..5e64ae4 --- /dev/null +++ b/examples/images/netpbm_p4_mono_width.pbm.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2025 Karolis Stasaitis +# SPDX-License-Identifier: MIT diff --git a/tests/test_pbm_load.py b/tests/test_pbm_load.py index f1ba849..e999657 100644 --- a/tests/test_pbm_load.py +++ b/tests/test_pbm_load.py @@ -72,7 +72,7 @@ def test_load_works_p1_ascii(self): palette.validate() def test_load_works_p4_in_mem(self): - file = BytesIO(b"P4\n4 2\n\x55") + file = BytesIO(b"P4\n4 2\n\x5f\x5f") bitmap, palette = pnm.load( file, b"P4", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface ) @@ -103,6 +103,27 @@ def test_load_works_p4_binary(self): self.assertEqual(15, bitmap.height) bitmap.validate() + def test_load_works_p4_binary_padded_width(self): + test_file = os.path.join( + os.path.dirname(__file__), + "..", + "examples", + "images", + "netpbm_p4_mono_width.pbm", + ) + with open(test_file, "rb") as file: + bitmap, palette = pnm.load( + file, b"P4", bitmap=Bitmap_C_Interface, palette=Palette_C_Interface + ) + self.assertEqual(1, palette.num_colors) + palette.validate() + self.assertEqual(b"\xff\xff\xff", palette[0]) + self.assertTrue(isinstance(bitmap, Bitmap_C_Interface)) + self.assertEqual(1, bitmap.colors) + self.assertEqual(14, bitmap.width) + self.assertEqual(20, bitmap.height) + bitmap.validate() + def test_load_works_p4_binary_high_res(self): test_file = os.path.join( os.path.dirname(__file__), From b06450917bee3a345d820ae7ae2d89335545d734 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 30 May 2025 14:21:13 -0500 Subject: [PATCH 58/59] displayio API update --- examples/imageload_netpbm.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/imageload_netpbm.py b/examples/imageload_netpbm.py index 06ca3f1..13c9b58 100644 --- a/examples/imageload_netpbm.py +++ b/examples/imageload_netpbm.py @@ -15,6 +15,7 @@ import adafruit_ili9341 import board import displayio +import fourwire import adafruit_imageload @@ -23,7 +24,7 @@ tft_dc = board.D10 displayio.release_displays() -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs) display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240) From 0dbfcf122ccea1af94f5768279aabc0f1dada7fb Mon Sep 17 00:00:00 2001 From: foamyguy Date: Fri, 30 May 2025 14:37:17 -0500 Subject: [PATCH 59/59] fix mock Bitmap interface for tests --- tests/displayio_shared_bindings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/displayio_shared_bindings.py b/tests/displayio_shared_bindings.py index 5d796d7..d938e6c 100644 --- a/tests/displayio_shared_bindings.py +++ b/tests/displayio_shared_bindings.py @@ -50,6 +50,13 @@ def __init__(self, width: int, height: int, colors: int) -> None: self.height = height self.colors = colors self.data = {} + bits = 1 + while (colors - 1) >> bits: + if bits < 8: + bits = bits << 1 + else: + bits += 8 + self._bits_per_value = bits def _abs_pos(self, width: int, height: int) -> int: if height >= self.height: