diff options
| author | Ryan <fauxpark@gmail.com> | 2024-10-12 10:10:02 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-12 00:10:02 +0100 |
| commit | 6129af93f497077a994e8e41473e2bd3d6ea5e67 (patch) | |
| tree | 68de5019339936b281fe337a5d8e5273f8b7dec5 /drivers/painter | |
| parent | a10e7cc8582114267ab474a0049619b510199322 (diff) | |
Rename RGB and HSV structs (#24471)
Diffstat (limited to 'drivers/painter')
| -rw-r--r-- | drivers/painter/generic/qp_surface_rgb565.c | 2 | ||||
| -rw-r--r-- | drivers/painter/tft_panel/qp_tft_panel.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/painter/generic/qp_surface_rgb565.c b/drivers/painter/generic/qp_surface_rgb565.c index 8883ed541d..c5b351311a 100644 --- a/drivers/painter/generic/qp_surface_rgb565.c +++ b/drivers/painter/generic/qp_surface_rgb565.c | |||
| @@ -52,7 +52,7 @@ static bool qp_surface_pixdata_rgb565(painter_device_t device, const void *pixel | |||
| 52 | // Pixel colour conversion | 52 | // Pixel colour conversion |
| 53 | static bool qp_surface_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { | 53 | static bool qp_surface_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { |
| 54 | for (int16_t i = 0; i < palette_size; ++i) { | 54 | for (int16_t i = 0; i < palette_size; ++i) { |
| 55 | RGB rgb = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); | 55 | rgb_t rgb = hsv_to_rgb_nocie((hsv_t){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); |
| 56 | uint16_t rgb565 = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3); | 56 | uint16_t rgb565 = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3); |
| 57 | palette[i].rgb565 = __builtin_bswap16(rgb565); | 57 | palette[i].rgb565 = __builtin_bswap16(rgb565); |
| 58 | } | 58 | } |
diff --git a/drivers/painter/tft_panel/qp_tft_panel.c b/drivers/painter/tft_panel/qp_tft_panel.c index 16dba9d6a6..c8e33343d4 100644 --- a/drivers/painter/tft_panel/qp_tft_panel.c +++ b/drivers/painter/tft_panel/qp_tft_panel.c | |||
| @@ -90,7 +90,7 @@ bool qp_tft_panel_pixdata(painter_device_t device, const void *pixel_data, uint3 | |||
| 90 | 90 | ||
| 91 | bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { | 91 | bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { |
| 92 | for (int16_t i = 0; i < palette_size; ++i) { | 92 | for (int16_t i = 0; i < palette_size; ++i) { |
| 93 | RGB rgb = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); | 93 | rgb_t rgb = hsv_to_rgb_nocie((hsv_t){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); |
| 94 | uint16_t rgb565 = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3); | 94 | uint16_t rgb565 = (((uint16_t)rgb.r) >> 3) << 11 | (((uint16_t)rgb.g) >> 2) << 5 | (((uint16_t)rgb.b) >> 3); |
| 95 | palette[i].rgb565 = __builtin_bswap16(rgb565); | 95 | palette[i].rgb565 = __builtin_bswap16(rgb565); |
| 96 | } | 96 | } |
| @@ -99,7 +99,7 @@ bool qp_tft_panel_palette_convert_rgb565_swapped(painter_device_t device, int16_ | |||
| 99 | 99 | ||
| 100 | bool qp_tft_panel_palette_convert_rgb888(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { | 100 | bool qp_tft_panel_palette_convert_rgb888(painter_device_t device, int16_t palette_size, qp_pixel_t *palette) { |
| 101 | for (int16_t i = 0; i < palette_size; ++i) { | 101 | for (int16_t i = 0; i < palette_size; ++i) { |
| 102 | RGB rgb = hsv_to_rgb_nocie((HSV){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); | 102 | rgb_t rgb = hsv_to_rgb_nocie((hsv_t){palette[i].hsv888.h, palette[i].hsv888.s, palette[i].hsv888.v}); |
| 103 | palette[i].rgb888.r = rgb.r; | 103 | palette[i].rgb888.r = rgb.r; |
| 104 | palette[i].rgb888.g = rgb.g; | 104 | palette[i].rgb888.g = rgb.g; |
| 105 | palette[i].rgb888.b = rgb.b; | 105 | palette[i].rgb888.b = rgb.b; |
