Merge pull request #4454 from jepler/bitmaptools-readinto-4bit

jepler · web-flow · commit a05aab8304d8 · 2021-03-21T19:56:23.000-05:00
Fix reading 4-bit data
diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c
@@ -441,7 +441,7 @@ void common_hal_bitmaptools_readinto(displayio_bitmap_t *self, pyb_file_obj_t *f
                     int byte_offset = x / 2;
                     int bit_offset = 4 * (reverse_pixels_in_element ? (1 - x % 2) : x % 2);
 
-                    value = (rowdata8[byte_offset] >> bit_offset) & 7;
+                    value = (rowdata8[byte_offset] >> bit_offset) & 0xf;
                     break;
                 }
                 case 8:

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ void common_hal_bitmaptools_readinto(displayio_bitmap_t self, pyb_file_obj_t f`
`441`	`441`	`int byte_offset = x / 2;`
`442`	`442`	`int bit_offset = 4 * (reverse_pixels_in_element ? (1 - x % 2) : x % 2);`
`443`	`443`
`444`		`- value = (rowdata8[byte_offset] >> bit_offset) & 7;`
	`444`	`+ value = (rowdata8[byte_offset] >> bit_offset) & 0xf;`
`445`	`445`	`break;`
`446`	`446`	`}`
`447`	`447`	`case 8:`