Skip to content

Commit 16a0306

Browse files
Remove the pixel_luma parameter from displayio_colorconverter_compute_tricolor (Closes #5194)
Not tested, I don't currently have a three colour eInk screen to test with.
1 parent 78769b8 commit 16a0306

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

shared-module/displayio/ColorConverter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ uint8_t displayio_colorconverter_compute_hue(uint32_t color_rgb888) {
9696
return hue;
9797
}
9898

99-
void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint8_t pixel_luma, uint32_t *color) {
99+
void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color) {
100100

101101
int16_t hue_diff = colorspace->tricolor_hue - pixel_hue;
102102
if ((-10 <= hue_diff && hue_diff <= 10) || hue_diff <= -220 || hue_diff >= 220) {
@@ -244,7 +244,7 @@ void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
244244
return;
245245
}
246246
uint8_t pixel_hue = displayio_colorconverter_compute_hue(pixel);
247-
displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, luma, &output_color->pixel);
247+
displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, &output_color->pixel);
248248
return;
249249
} else if (colorspace->grayscale && colorspace->depth <= 8) {
250250
uint8_t luma = displayio_colorconverter_compute_luma(pixel);

shared-module/displayio/ColorConverter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888);
5151
uint8_t displayio_colorconverter_compute_luma(uint32_t color_rgb888);
5252
uint8_t displayio_colorconverter_compute_chroma(uint32_t color_rgb888);
5353
uint8_t displayio_colorconverter_compute_hue(uint32_t color_rgb888);
54-
void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint8_t pixel_luma, uint32_t *color);
54+
void displayio_colorconverter_compute_tricolor(const _displayio_colorspace_t *colorspace, uint8_t pixel_hue, uint32_t *color);
5555

5656
#endif // MICROPY_INCLUDED_SHARED_MODULE_DISPLAYIO_COLORCONVERTER_H

shared-module/displayio/Palette.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ bool displayio_palette_get_color(displayio_palette_t *self, const _displayio_col
8585
return true;
8686
}
8787
uint8_t pixel_hue = self->colors[palette_index].hue;
88-
displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, luma, color);
88+
displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, color);
8989
} else if (colorspace->grayscale) {
9090
size_t bitmask = (1 << colorspace->depth) - 1;
9191
*color = (self->colors[palette_index].luma >> colorspace->grayscale_bit) & bitmask;

0 commit comments

Comments
 (0)