Skip to content

Commit 3ab6a23

Browse files
Removed unused return value in displayio_colorconverter_convert
1 parent d87bfaf commit 3ab6a23

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

shared-module/displayio/ColorConverter.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void common_hal_displayio_colorconverter_convert(displayio_colorconverter_t *sel
121121
(*output_color) = output_pixel.pixel;
122122
}
123123

124-
bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
124+
void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color) {
125125
uint32_t pixel = input_pixel->pixel;
126126

127127
if (colorspace->dither){
@@ -149,7 +149,7 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
149149
if (colorspace->depth == 16) {
150150
output_color->pixel = displayio_colorconverter_compute_rgb565(pixel);
151151
output_color->opaque = true;
152-
return true;
152+
return;
153153
} else if (colorspace->tricolor) {
154154
uint8_t luma = displayio_colorconverter_compute_luma(pixel);
155155
output_color->pixel = luma >> (8 - colorspace->depth);
@@ -158,19 +158,18 @@ bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _d
158158
output_color->pixel = 0;
159159
}
160160
output_color->opaque = true;
161-
return true;
161+
return;
162162
}
163163
uint8_t pixel_hue = displayio_colorconverter_compute_hue(pixel);
164164
displayio_colorconverter_compute_tricolor(colorspace, pixel_hue, luma, &output_color->pixel);
165-
return true;
165+
return;
166166
} else if (colorspace->grayscale && colorspace->depth <= 8) {
167167
uint8_t luma = displayio_colorconverter_compute_luma(pixel);
168168
output_color->pixel = luma >> (8 - colorspace->depth);
169169
output_color->opaque = true;
170-
return true;
170+
return;
171171
}
172172
output_color->opaque = false;
173-
return false;
174173
}
175174

176175
// Currently no refresh logic is needed for a ColorConverter.

shared-module/displayio/ColorConverter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ typedef struct {
3939

4040
bool displayio_colorconverter_needs_refresh(displayio_colorconverter_t *self);
4141
void displayio_colorconverter_finish_refresh(displayio_colorconverter_t *self);
42-
bool displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color);
42+
void displayio_colorconverter_convert(displayio_colorconverter_t *self, const _displayio_colorspace_t* colorspace, const displayio_input_pixel_t *input_pixel, displayio_output_pixel_t *output_color);
4343

4444
uint32_t displayio_colorconverter_dither_noise_1 (uint32_t n);
4545
uint32_t displayio_colorconverter_dither_noise_2(uint32_t x, uint32_t y);

0 commit comments

Comments
 (0)