summaryrefslogtreecommitdiffstats
path: root/lib/python
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-05-26 02:07:54 +0000
committerQMK Bot <hello@qmk.fm>2023-05-26 02:07:54 +0000
commit5efdc28a862d7f469d959d9881e7ee70956dd81f (patch)
tree841c9d4d3ca1c911ec48e2c0238568243465e533 /lib/python
parentb2e5017e74f22ea38a3a12e8b4a672ae7a077727 (diff)
parent1c1bc565dea0b2a8f7ccafc2d002b119b9f4e0fd (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/qmk/painter.py36
1 files changed, 19 insertions, 17 deletions
diff --git a/lib/python/qmk/painter.py b/lib/python/qmk/painter.py
index 7ecdc55404..48310c8961 100644
--- a/lib/python/qmk/painter.py
+++ b/lib/python/qmk/painter.py
@@ -158,32 +158,34 @@ def convert_requested_format(im, format):
ncolors = format["num_colors"]
image_format = format["image_format"]
+ # -- Check if ncolors is valid
+ # Formats accepting several options
+ if image_format in ['IMAGE_FORMAT_GRAYSCALE', 'IMAGE_FORMAT_PALETTE']:
+ valid = [2, 4, 8, 16, 256]
+
+ # Formats expecting a particular number
+ else:
+ # Read number from specs dict, instead of hardcoding
+ for _, fmt in valid_formats.items():
+ if fmt["image_format"] == image_format:
+ # has to be an iterable, to use `in`
+ valid = [fmt["num_colors"]]
+ break
+
+ if ncolors not in valid:
+ raise ValueError(f"Number of colors must be: {', '.join(valid)}.")
+
# Work out where we're getting the bytes from
if image_format == 'IMAGE_FORMAT_GRAYSCALE':
- # Ensure we have a valid number of colors for the palette
- if ncolors <= 0 or ncolors > 256 or (ncolors & (ncolors - 1) != 0):
- raise ValueError("Number of colors must be 2, 4, 16, or 256.")
# If mono, convert input to grayscale, then to RGB, then grab the raw bytes corresponding to the intensity of the red channel
im = ImageOps.grayscale(im)
im = im.convert("RGB")
elif image_format == 'IMAGE_FORMAT_PALETTE':
- # Ensure we have a valid number of colors for the palette
- if ncolors <= 0 or ncolors > 256 or (ncolors & (ncolors - 1) != 0):
- raise ValueError("Number of colors must be 2, 4, 16, or 256.")
# If color, convert input to RGB, palettize based on the supplied number of colors, then get the raw palette bytes
im = im.convert("RGB")
im = im.convert("P", palette=Image.ADAPTIVE, colors=ncolors)
- elif image_format == 'IMAGE_FORMAT_RGB565':
- # Ensure we have a valid number of colors for the palette
- if ncolors != 65536:
- raise ValueError("Number of colors must be 65536.")
- # If color, convert input to RGB
- im = im.convert("RGB")
- elif image_format == 'IMAGE_FORMAT_RGB888':
- # Ensure we have a valid number of colors for the palette
- if ncolors != 1677216:
- raise ValueError("Number of colors must be 16777216.")
- # If color, convert input to RGB
+ elif image_format in ['IMAGE_FORMAT_RGB565', 'IMAGE_FORMAT_RGB888']:
+ # Convert input to RGB
im = im.convert("RGB")
return im