From 3ce927d06048750ba64b0348ea2df30994782f33 Mon Sep 17 00:00:00 2001 From: Dave Astels Date: Fri, 16 Aug 2019 21:11:32 -0400 Subject: [PATCH 1/3] Bring up to date with changes to Display.c --- adafruit_bitmapsaver.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/adafruit_bitmapsaver.py b/adafruit_bitmapsaver.py index 8bc8edd..8ed9ce7 100644 --- a/adafruit_bitmapsaver.py +++ b/adafruit_bitmapsaver.py @@ -91,6 +91,7 @@ def _write_pixels(output_file, pixel_source, palette): saving_bitmap = isinstance(pixel_source, Bitmap) width, height = _rotated_height_and_width(pixel_source) row_buffer = bytearray(_bytes_per_row(width)) + result_buffer = bytearray(2048) for y in range(height, 0, -1): buffer_index = 0 if saving_bitmap: @@ -102,7 +103,7 @@ def _write_pixels(output_file, pixel_source, palette): color >>= 8 buffer_index += 1 else: - data = pixel_source.fill_area(x=0, y=y-1, width=width, height=1) + data = pixel_source.fill_row(y=y-1, buffer=result_buffer) for i in range(width): pixel565 = (data[i * 2] << 8) + data[i * 2 + 1] for b in _rgb565_to_bgr_tuple(pixel565): @@ -137,7 +138,7 @@ def save_pixels(file_or_filename, pixel_source=board.DISPLAY, palette=None): _write_bmp_header(output_file, filesize) _write_dib_header(output_file, width, height) _write_pixels(output_file, pixel_source, palette) - except Exception: - raise + except Exception as e: + raise e else: output_file.close() From 657cd800e2fbec38c3ede746405b88e89023c747 Mon Sep 17 00:00:00 2001 From: Dave Astels Date: Fri, 16 Aug 2019 21:13:07 -0400 Subject: [PATCH 2/3] Rename exception for pylint --- adafruit_bitmapsaver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_bitmapsaver.py b/adafruit_bitmapsaver.py index 8ed9ce7..c28b363 100644 --- a/adafruit_bitmapsaver.py +++ b/adafruit_bitmapsaver.py @@ -138,7 +138,7 @@ def save_pixels(file_or_filename, pixel_source=board.DISPLAY, palette=None): _write_bmp_header(output_file, filesize) _write_dib_header(output_file, width, height) _write_pixels(output_file, pixel_source, palette) - except Exception as e: - raise e + except Exception as ex: + raise ex else: output_file.close() From 18f9f247987d9be6827d41d0cb6ed91ad09671e6 Mon Sep 17 00:00:00 2001 From: Dave Astels Date: Tue, 20 Aug 2019 10:02:48 -0400 Subject: [PATCH 3/3] Reflect switch to positional parameters --- adafruit_bitmapsaver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adafruit_bitmapsaver.py b/adafruit_bitmapsaver.py index c28b363..fc503a5 100644 --- a/adafruit_bitmapsaver.py +++ b/adafruit_bitmapsaver.py @@ -103,7 +103,7 @@ def _write_pixels(output_file, pixel_source, palette): color >>= 8 buffer_index += 1 else: - data = pixel_source.fill_row(y=y-1, buffer=result_buffer) + data = pixel_source.fill_row(y-1, result_buffer) for i in range(width): pixel565 = (data[i * 2] << 8) + data[i * 2 + 1] for b in _rgb565_to_bgr_tuple(pixel565):