Skip to content

bitmaptools: readinto() reads whole rows from streams like sockets #11627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhalbert merged 1 commit into from
Oct 18, 2026
Merged

bitmaptools: readinto() reads whole rows from streams like sockets #11627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions shared-module/bitmaptools/__init__.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ void common_hal_bitmaptools_arrayblit(displayio_bitmap_t *self, void *data, int
void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, mp_obj_t *file, int element_size, int bits_per_pixel, bool reverse_pixels_in_element, bool swap_bytes, bool reverse_rows) {
uint32_t mask = (1 << common_hal_displayio_bitmap_get_bits_per_value(self)) - 1;

const mp_stream_p_t *file_proto = mp_get_stream_raise(file, MP_STREAM_OP_READ);
mp_get_stream_raise(file, MP_STREAM_OP_READ);

displayio_area_t a = {0, 0, self->width, self->height, NULL};
displayio_bitmap_set_dirty_area(self, &a);
Expand All @@ -593,8 +593,9 @@ void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, mp_obj_t *file, i
const int y_draw = reverse_rows ? (self->height) - 1 - y : y;


// A stream such as a socket can return part of a row, so read until the row is complete.
int error = 0;
mp_uint_t bytes_read = file_proto->read(file, rowdata32, rowsize, &error);
mp_uint_t bytes_read = mp_stream_read_exactly(file, rowdata32, rowsize, &error);
if (error) {
mp_raise_OSError(error);
}
Expand Down
Loading