10000 displayio.Bitmap is now byte-aligned for depth < 8 · pypewpew/circuitpython@c325795 · GitHub
[go: up one dir, main page]
Skip to content

Commit c325795

Browse files
deshipudeshipu
committed
displayio.Bitmap is now byte-aligned for depth < 8
The traditional layout of pixels in bitmaps of depth less than eight is with the order of values in a byte reversed, but with bytes in the same order as the pixels on the line. Before now, displayio.Bitmap did reverse the values, but did it on a word (four bytes) basis, not byte, which resulted in groups of four bytes being in the order opposite to the screen order. This patch fixes this, by making processing of pixels in bitmaps of depth less than 8 bits based on bytes, not words. Since the internal details are changing, any code that accessed bitmaps through the memoryview buffer, or that created bitmaps directly from raw data, and that used depth of less than 8 bits will be affected.
1 parent 87f7bc9 commit c325795

File tree

1 file changed

+40
-19
lines changed

1 file changed

+40
-19
lines changed

‎shared-module/displayio/Bitmap.c

Lines changed: 40 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
1-
// This file is part of the CircuitPython project: https://circuitpython.org
2-
//
3-
// SPDX-FileCopyrightText: Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
4-
//
5-
// SPDX-License-Identifier: MIT
1+
/*
2+
* This file is part of the Micro Python project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2018 Scott Shawcroft for Adafruit Industries
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
626

727
#include "shared-bindings/displayio/Bitmap.h"
828

@@ -49,7 +69,7 @@ void common_hal_displayio_bitmap_construct_from_buffer(displayio_bitmap_t *self,
4969
self->x_shift = 0; // Used to divide the index by the number of pixels per word. Its used in a
5070
// shift which effectively divides by 2 ** x_shift.
5171
uint32_t power_of_two = 1;
52-
while (power_of_two < ALIGN_BITS / bits_per_value) {
72+
while (power_of_two < 8 / bits_per_value) {
5373
self->x_shift++;
5474
power_of_two <<= 1;
5575
}
@@ -90,13 +110,14 @@ uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *self, int16_t
90110
return 0;
91111
}
92112
int32_t row_start = y * self->stride;
93-
uint32_t bytes_per_value = self->bits_per_value / 8;
113+
uint32_t *row = self->data + row_start;
114+
uint8_t bytes_per_value = self->bits_per_value / 8;
115+
uint8_t values_per_byte = 8 / self->bits_per_value;
94116
if (bytes_per_value < 1) {
95-
uint32_t word = self->data[row_start + (x >> self->x_shift)];
96-
97-
return (word >> (sizeof(uint32_t) * 8 - ((x & self->x_mask) + 1) * self->bits_per_value)) & self->bitmask;
117+
uint8_t bits = ((uint8_t *)row)[x >> self->x_shift];
118+
uint8_t bit_position = (values_per_byte - (x & self->x_mask) - 1) * self->bits_per_value;
119+
return (bits >> bit_position) & self->bitmask;
98120
} else {
99-
uint32_t *row = self->data + row_start;
100121
if (bytes_per_value == 1) {
101122
return ((uint8_t *)row)[x];
102123
} else if (bytes_per_value == 2) {
@@ -134,16 +155,16 @@ void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y
134155

135156
// Update one pixel of data
136157
int32_t row_start = y * self->stride;
137-
uint32_t bytes_per_value = self->bits_per_value / 8;
158+
uint32_t *row = self->data + row_start;
159+
uint8_t bytes_per_value = self->bits_per_value / 8;
160+
uint8_t values_per_byte = 8 / self->bits_per_value;
138161
if (bytes_per_value < 1) {
139-
uint32_t bit_position = (sizeof(uint32_t) * 8 - ((x & self->x_mask) + 1) * self->bits_per_value);
140-
uint32_t index = row_start + (x >> self->x_shift);
141-
uint32_t word = self->data[index];
142-
word &= ~(self->bitmask << bit_position);
143-
word |= (value & self->bitmask) << bit_position;
144-
self->data[index] = word;
162+
uint8_t bits = ((uint8_t *)row)[x >> self->x_shift];
163+
uint8_t bit_position = (values_per_byte - (x & self->x_mask) - 1) * self->bits_per_value;
164+
bits &= ~(self->bitmask << bit_position);
165+
bits |= (value & self->bitmask) << bit_position;
166+
((uint8_t *)row)[x >> self->x_shift] = bits;
145167
} else {
146-
uint32_t *row = self->data + row_start;
147168
if (bytes_per_value == 1) {
148169
((uint8_t *)row)[x] = value;
149170
} else if (bytes_per_value == 2) {

0 commit comments

Comments
 (0)
0