Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
fe58538b8f
|
@ -273,6 +273,10 @@ static bool qp_drawimage_recolor_impl(painter_device_t device, uint16_t x, uint1
|
||||||
if (ret && output_state.pixel_write_pos > 0) {
|
if (ret && output_state.pixel_write_pos > 0) {
|
||||||
ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
|
ret &= driver->driver_vtable->pixdata(device, qp_internal_global_pixdata_buffer, output_state.pixel_write_pos);
|
||||||
}
|
}
|
||||||
|
} else if (frame_info->bpp != driver->native_bits_per_pixel) {
|
||||||
|
// Prevent stuff like drawing 24bpp images on 16bpp displays
|
||||||
|
qp_dprintf("Image's bpp doesn't match the target display's native_bits_per_pixel\n");
|
||||||
|
return false;
|
||||||
} else {
|
} else {
|
||||||
// Set up the output state
|
// Set up the output state
|
||||||
qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
|
qp_internal_byte_output_state_t output_state = {.device = device, .byte_write_pos = 0, .max_bytes = qp_internal_num_pixels_in_buffer(device) * driver->native_bits_per_pixel / 8};
|
||||||
|
|
Loading…
Reference in New Issue