Add reverse_rows option to bitmaptools.readinto #4

kmatch98 · 2021-03-16T15:14:23Z

This is added helper for loading graphics BMP files where the rows are reversed, adding a reverse_rows input parameter to bitmaptools.readinto. This supports updates to the adafruit_imageload library.

Observed a speedup of about 4x when loading the purple.bmp: https://cdn-learn.adafruit.com/assets/assets/000/074/681/original/purple.bmp?1555717198

Currently translated at 80.3% (783 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/

Currently translated at 98.8% (964 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/

Currently translated at 100.0% (975 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/

Currently translated at 99.4% (969 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/

Currently translated at 44.4% (433 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/it/

Currently translated at 100.0% (974 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/

Currently translated at 100.0% (974 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/

kmatch98 · 2021-03-16T15:46:45Z

Build is failing for:

E: The repository 'https://dl.bintray.com/sbt/debian  Release' is no longer signed.

No ideas how to resolve this one....

Add Sourcegraph link and raspberrypi port

Translations update from Weblate

Add RP2040 displayio.ParallelBus Support

Adding LED for D13/L pin name.

jepler

Thanks!

jepler · 2021-03-17T00:13:40Z

Oh look, conflicts. Do you want to wait on adding this until after the original PR gets merged? Due to the addition of auto code formatting, the code all got changed out from under us. Progress!

kmatch98 · 2021-03-17T00:18:04Z

No problem at all. I’ll await for when the PR gets merged and figure out how to merge this into that.

bitmaptools: Add readinto, arrayblit

kmatch98 · 2021-03-19T14:13:20Z

Moved to here: adafruit#4428

from main

asan considers that memcmp(p, q, N) is permitted to access N bytes at each of p and q, even for values of p and q that have a difference earlier. Accessing additional values is frequently done in practice, reading 4 or more bytes from each input at a time for efficiency, so when completing "non_exist<TAB>" in the repl, this causes a diagnostic: ``` ==16938==ERROR: AddressSanitizer: global-buffer-overflow on address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fffffffd1d0 READ of size 9 at 0x555555cd8dc8 thread T0 #0 0x7ffff726457a (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301 #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/readline.c:225 #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513 #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/unix/main.c:194 adafruit#5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/main.c:673 adafruit#6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/main.c:436 adafruit#7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308 adafruit#8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/unix/micropython-coverage+0x40bd69) 0x555555cd8dc8 is located 0 bytes to the right of global variable 'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of size 8 'import_str' is ascii string 'import ' SUMMARY: AddressSanitizer: global-buffer-overflow (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) Shadow bytes around the buggy address: 0x0aab2ab93160: 04 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93170: 05 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93180: 06 f9 f9 f9 f9 f9 f9 f9 06 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93190: 05 f9 f9 f9 f9 f9 f9 f9 00 00 f9 f9 f9 f9 f9 f9 0x0aab2ab931a0: 00 00 00 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 f9 =>0x0aab2ab931b0: 00 00 00 00 00 00 00 00 00[f9]f9 f9 f9 f9 f9 f9 0x0aab2ab931c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0aab2ab931d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0aab2ab931e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 f9 0x0aab2ab931f0: f9 f9 f9 f9 00 00 00 00 00 00 00 00 00 f9 f9 f9 0x0aab2ab93200: f9 f9 f9 f9 00 00 00 00 00 00 00 00 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ==16938==ABORTING ```

asan considers that memcmp(p, q, N) is permitted to access N bytes at each of p and q, even for values of p and q that have a difference earlier. Accessing additional values is frequently done in practice, reading 4 or more bytes from each input at a time for efficiency, so when completing "non_exist<TAB>" in the repl, this causes a diagnostic: ``` ==16938==ERROR: AddressSanitizer: global-buffer-overflow on address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fffffffd1d0 READ of size 9 at 0x555555cd8dc8 thread T0 #0 0x7ffff726457a (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301 #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/readline.c:225 #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513 #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/unix/main.c:194 adafruit#5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/main.c:673 adafruit#6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/main.c:436 adafruit#7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308 adafruit#8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/unix/micropython-coverage+0x40bd69) 0x555555cd8dc8 is located 0 bytes to the right of global variable 'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of size 8 'import_str' is ascii string 'import ' SUMMARY: AddressSanitizer: global-buffer-overflow (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) Shadow bytes around the buggy address: 0x0aab2ab93160: 04 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93170: 05 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93180: 06 f9 f9 f9 f9 f9 f9 f9 06 f9 f9 f9 f9 f9 f9 f9 0x0aab2ab93190: 05 f9 f9 f9 f9 f9 f9 f9 00 00 f9 f9 f9 f9 f9 f9 0x0aab2ab931a0: 00 00 00 00 00 00 00 00 04 f9 f9 f9 f9 f9 f9 f9 =>0x0aab2ab931b0: 00 00 00 00 00 00 00 00 00[f9]f9 f9 f9 f9 f9 f9 0x0aab2ab931c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0aab2ab931d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x0aab2ab931e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 f9 0x0aab2ab931f0: f9 f9 f9 f9 00 00 00 00 00 00 00 00 00 f9 f9 f9 0x0aab2ab93200: f9 f9 f9 f9 00 00 00 00 00 00 00 00 00 00 00 00 Shadow byte legend (one shadow byte represents 8 application bytes): Addressable: 00 Partially addressable: 01 02 03 04 05 06 07 Heap left redzone: fa Freed heap region: fd Stack left redzone: f1 Stack mid redzone: f2 Stack right redzone: f3 Stack after return: f5 Stack use after scope: f8 Global redzone: f9 Global init order: f6 Poisoned by user: f7 Container overflow: fc Array cookie: ac Intra object redzone: bb ASan internal: fe Left alloca redzone: ca Right alloca redzone: cb ==16938==ABORTING ``` Signed-off-by: Jeff Epler <jepler@gmail.com>

asan considers that memcmp(p, q, N) is permitted to access N bytes at each of p and q, even for values of p and q that have a difference earlier. Accessing additional values is frequently done in practice, reading 4 or more bytes from each input at a time for efficiency, so when completing "non_exist<TAB>" in the repl, this causes a diagnostic: ``` ==16938==ERROR: AddressSanitizer: global-buffer-overflow on address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fff READ of size 9 at 0x555555cd8dc8 thread T0 #0 0x7ffff726457a (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301 #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/re #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513 #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/uni adafruit#5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/ adafruit#6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/m adafruit#7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308 adafruit#8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/uni 0x555555cd8dc8 is located 0 bytes to the right of global variable 'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of size 8 'import_str' is ascii string 'import ' ``` Signed-off-by: Jeff Epler <jepler@gmail.com>

asan considers that memcmp(p, q, N) is permitted to access N bytes at each of p and q, even for values of p and q that have a difference earlier. Accessing additional values is frequently done in practice, reading 4 or more bytes from each input at a time for efficiency, so when completing "non_exist<TAB>" in the repl, this causes a diagnostic: ==16938==ERROR: AddressSanitizer: global-buffer-overflow on address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fff READ of size 9 at 0x555555cd8dc8 thread T0 #0 0x7ffff726457a (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a) #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301 #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/re #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513 #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/uni adafruit#5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/ adafruit#6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/m adafruit#7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308 adafruit#8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/uni 0x555555cd8dc8 is located 0 bytes to the right of global variable 'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of size 8 'import_str' is ascii string 'import ' Signed-off-by: Jeff Epler <jepler@gmail.com>

Pull in the latest main branch from adafruit

gamblor21 and others added 28 commits March 11, 2021 19:32

Initial commit

c6aaab6

Removing debug info and clean up

b080d62

Add frequency support to parallel bus

56a2199

Added frequency to parallel display

7321411

Updated to initalize pindirs

c384ebe

Set the statemachine to never reset so REPL works

1658fe0

Set frequency default 60Mhz

b02b1e9

Changed frequency to match PIO having 2 instructions

5689307

Fix after rebase

307d2a9

Add Sourcegraph link and raspberrypi port

4538d97

Add back empty line

921bf6d

Translated using Weblate (German)

477a58f

Currently translated at 80.3% (783 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/de/

Translated using Weblate (French)

c560e79

Currently translated at 98.8% (964 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/

Translated using Weblate (Chinese (Pinyin))

a5e2b73

Currently translated at 100.0% (975 of 975 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/

Merge remote-tracking branch 'origin/main' into main

c8b3562

Update translation files

65cc95d

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/

Merge remote-tracking branch 'origin/main' into main

2115a76

Merge branch 'main' into rp_dp_parallel

e326d7c

Fixed formatting

3b01a65

Formatting fixes

fb437d8

More formatting

0890b54

Formatting

bdc3688

Translated using Weblate (French)

c6e696a

Currently translated at 99.4% (969 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/

Translated using Weblate (Italian)

9d523fd

Currently translated at 44.4% (433 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/it/

Translated using Weblate (Portuguese (Brazil))

cd108e5

Currently translated at 100.0% (974 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/

Translated using Weblate (Swedish)

4a5df5a

Currently translated at 100.0% (974 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/

Merge remote-tracking branch 'origin/main' into main

5167e9c

Add reverse_rows option to bitmaptools.readinto

227ac67

kmatch98 mentioned this pull request Mar 16, 2021

Add option for using bitmaptools.readinto for indexed bitmap loads adafruit/Adafruit_CircuitPython_ImageLoad#45

Merged

update docstrings

a367e84

امير محمد العمري and others added 2 commits March 16, 2021 16:42

Translated using Weblate (Swedish)

e16c0f3

Currently translated at 100.0% (974 of 974 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/

update more docstrings

870dadc

kattni and others added 6 commits March 16, 2021 12:14

Adding LED for D13/L pin name.

2b910b7

Merge pull request adafruit#4416 from adafruit/tannewt-patch-1

9e0cfcf

Add Sourcegraph link and raspberrypi port

Merge remote-tracking branch 'origin/main' into main

f13bee0

Merge pull request adafruit#4418 from weblate/weblate-circuitpython-main

856bf30

Translations update from Weblate

Merge pull request adafruit#4130 from gamblor21/rp_dp_parallel

1be5ca7

Add RP2040 displayio.ParallelBus Support

Merge pull request adafruit#4421 from kattni/led-pin

75ba26e

Adding LED for D13/L pin name.

jepler approved these changes Mar 17, 2021

View reviewed changes

jepler and others added 4 commits March 17, 2021 07:57

Merge pull request adafruit#4403 from jepler/bitmap-read-2

bfc8c89

bitmaptools: Add readinto, arrayblit

merge upstream/main

ef91e17

minor formatting

580121d

ran pre-commit for formatting fixes

c37a1f4

kmatch98 closed this Mar 19, 2021

jepler pushed a commit that referenced this pull request May 5, 2021

Merge pull request #4 from adafruit/main

b4e05da

from main

jepler pushed a commit that referenced this pull request Mar 17, 2023

Merge pull request #4 from adafruit/main

21857ed

Pull in the latest main branch from adafruit

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add reverse_rows option to bitmaptools.readinto #4

Add reverse_rows option to bitmaptools.readinto #4

kmatch98 commented Mar 16, 2021

kmatch98 commented Mar 16, 2021

jepler left a comment

jepler commented Mar 17, 2021

kmatch98 commented Mar 17, 2021

kmatch98 commented Mar 19, 2021

Add reverse_rows option to bitmaptools.readinto #4

Add reverse_rows option to bitmaptools.readinto #4

Conversation

kmatch98 commented Mar 16, 2021

kmatch98 commented Mar 16, 2021

jepler left a comment

Choose a reason for hiding this comment

jepler commented Mar 17, 2021

kmatch98 commented Mar 17, 2021

kmatch98 commented Mar 19, 2021