Skip to content

Commit 101531b

Browse files
dhalbertdhalbert
authored
Merge pull request #1187 from tannewt/bitmap_disk
Add OnDiskBitmap which loads pixel data straight from disk.
2 parents 9ace50a + 75d497b commit 101531b

25 files changed

+791
-92
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ before_script:
6262
# For coverage testing (upgrade is used to get latest urllib3 version)
6363
- ([[ -z "$TRAVIS_TEST" ]] || sudo apt-get install -y python3-pip)
6464
- ([[ -z "$TRAVIS_TEST" ]] || sudo pip install --upgrade cpp-coveralls)
65-
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install Sphinx sphinx-rtd-theme recommonmark)
65+
- ([[ $TRAVIS_TEST != "docs" ]] || sudo pip install 'Sphinx<1.8.0' sphinx-rtd-theme recommonmark)
6666
- ([[ $TRAVIS_TEST != "translations" ]] || sudo pip3 install polib)
6767
- gcc --version
6868
- ([[ -z "$TRAVIS_BOARD" || $TRAVIS_BOARD = "feather_huzzah" ]] || arm-none-eabi-gcc --version)

‎locale/circuitpython.pot

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2018-09-06 14:55-0700\n"
11+
"POT-Creation-Date: 2018-09-12 16:24-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -123,7 +123,7 @@ msgstr ""
123123
msgid "queue overflow"
124124
msgstr ""
125125

126-
#: extmod/moduzlib.c:97
126+
#: extmod/moduzlib.c:98
127127
msgid "compression header"
128128
msgstr ""
129129

@@ -214,7 +214,7 @@ msgstr ""
214214
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
215215
msgstr ""
216216

217-
#: main.c:415
217+
#: main.c:416
218218
msgid "soft reboot\n"
219219
msgstr ""
220220

@@ -393,7 +393,7 @@ msgid "No TX pin"
393393
msgstr ""
394394

395395
#: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c:170
396-
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:153
396+
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:142
397397
msgid "Cannot get pull while in output mode"
398398
msgstr ""
399399

@@ -1960,6 +1960,7 @@ msgid "buffer must be a bytes-like object"
19601960
msgstr ""
19611961

19621962
#: shared-bindings/audioio/WaveFile.c:78
1963+
#: shared-bindings/displayio/OnDiskBitmap.c:85
19631964
msgid "file must be a file opened in byte mode"
19641965
msgstr ""
19651966

@@ -2034,6 +2035,10 @@ msgstr ""
20342035
msgid "row data must be a buffer"
20352036
msgstr ""
20362037

2038+
#: shared-bindings/displayio/ColorConverter.c:72
2039+
msgid "color should be an int"
2040+
msgstr ""
2041+
20372042
#: shared-bindings/displayio/FourWire.c:55
20382043
#: shared-bindings/displayio/FourWire.c:64
20392044
msgid "displayio is a work in progress"
@@ -2064,16 +2069,16 @@ msgstr ""
20642069
msgid "palette_index should be an int"
20652070
msgstr ""
20662071

2067-
#: shared-bindings/displayio/Sprite.c:45
2072+
#: shared-bindings/displayio/Sprite.c:48
20682073
msgid "position must be 2-tuple"
20692074
msgstr ""
20702075

2071-
#: shared-bindings/displayio/Sprite.c:87
2076+
#: shared-bindings/displayio/Sprite.c:97
20722077
msgid "unsupported bitmap type"
20732078
msgstr ""
20742079

2075-
#: shared-bindings/displayio/Sprite.c:152
2076-
msgid "palette must be displayio.Palette"
2080+
#: shared-bindings/displayio/Sprite.c:162
2081+
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
20772082
msgstr ""
20782083

20792084
#: shared-bindings/gamepad/GamePad.c:100
@@ -2302,6 +2307,24 @@ msgstr ""
23022307
msgid "Group full"
23032308
msgstr ""
23042309

2310+
#: shared-module/displayio/Group.c:48
2311+
msgid "Group empty"
2312+
msgstr ""
2313+
2314+
#: shared-module/displayio/OnDiskBitmap.c:49
2315+
msgid "Invalid BMP file"
2316+
msgstr ""
2317+
2318+
#: shared-module/displayio/OnDiskBitmap.c:59
2319+
#, c-format
2320+
msgid "Only Windows format, uncompressed BMP supported %d"
2321+
msgstr ""
2322+
2323+
#: shared-module/displayio/OnDiskBitmap.c:64
2324+
#, c-format
2325+
msgid "Only true color (24 bpp or higher) BMP supported %x"
2326+
msgstr ""
2327+
23052328
#: shared-module/struct/__init__.c:39
23062329
msgid "'S' and 'O' are not supported format types"
23072330
msgstr ""

‎locale/de_DE.po

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-06 14:55-0700\n"
10+
"POT-Creation-Date: 2018-09-12 16:24-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -123,7 +123,7 @@ msgstr "ungültiges cert"
123123
msgid "queue overflow"
124124
msgstr "Warteschlangenüberlauf"
125125

126-
#: extmod/moduzlib.c:97
126+
#: extmod/moduzlib.c:98
127127
msgid "compression header"
128128
msgstr "kompression header"
129129

@@ -223,7 +223,7 @@ msgstr ""
223223
"Drücke eine Taste um dich mit der REPL zu verbinden. Drücke Strg-D zum neu "
224224
"laden"
225225

226-
#: main.c:415
226+
#: main.c:416
227227
msgid "soft reboot\n"
228228
msgstr "weicher reboot\n"
229229

@@ -402,7 +402,7 @@ msgid "No TX pin"
402402
msgstr "Kein TX Pin"
403403

404404
#: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c:170
405-
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:153
405+
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:142
406406
msgid "Cannot get pull while in output mode"
407407
msgstr "Pull up im Ausgabemodus nicht möglich"
408408

@@ -1969,6 +1969,7 @@ msgid "buffer must be a bytes-like object"
19691969
msgstr ""
19701970

19711971
#: shared-bindings/audioio/WaveFile.c:78
1972+
#: shared-bindings/displayio/OnDiskBitmap.c:85
19721973
msgid "file must be a file opened in byte mode"
19731974
msgstr ""
19741975

@@ -2043,6 +2044,10 @@ msgstr ""
20432044
msgid "row data must be a buffer"
20442045
msgstr ""
20452046

2047+
#: shared-bindings/displayio/ColorConverter.c:72
2048+
msgid "color should be an int"
2049+
msgstr ""
2050+
20462051
#: shared-bindings/displayio/FourWire.c:55
20472052
#: shared-bindings/displayio/FourWire.c:64
20482053
msgid "displayio is a work in progress"
@@ -2073,17 +2078,17 @@ msgstr ""
20732078
msgid "palette_index should be an int"
20742079
msgstr ""
20752080

2076-
#: shared-bindings/displayio/Sprite.c:45
2081+
#: shared-bindings/displayio/Sprite.c:48
20772082
msgid "position must be 2-tuple"
20782083
msgstr ""
20792084

2080-
#: shared-bindings/displayio/Sprite.c:87
2085+
#: shared-bindings/displayio/Sprite.c:97
20812086
#, fuzzy
20822087
msgid "unsupported bitmap type"
20832088
msgstr "Baudrate wird nicht unterstütz"
20842089

2085-
#: shared-bindings/displayio/Sprite.c:152
2086-
msgid "palette must be displayio.Palette"
2090+
#: shared-bindings/displayio/Sprite.c:162
2091+
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
20872092
msgstr ""
20882093

20892094
#: shared-bindings/gamepad/GamePad.c:100
@@ -2312,6 +2317,25 @@ msgstr ""
23122317
msgid "Group full"
23132318
msgstr ""
23142319

2320+
#: shared-module/displayio/Group.c:48
2321+
msgid "Group empty"
2322+
msgstr ""
2323+
2324+
#: shared-module/displayio/OnDiskBitmap.c:49
2325+
#, fuzzy
2326+
msgid "Invalid BMP file"
2327+
msgstr "Ungültiger Pin"
2328+
2329+
#: shared-module/displayio/OnDiskBitmap.c:59
2330+
#, c-format
2331+
msgid "Only Windows format, uncompressed BMP supported %d"
2332+
msgstr ""
2333+
2334+
#: shared-module/displayio/OnDiskBitmap.c:64
2335+
#, c-format
2336+
msgid "Only true color (24 bpp or higher) BMP supported %x"
2337+
msgstr ""
2338+
23152339
#: shared-module/struct/__init__.c:39
23162340
msgid "'S' and 'O' are not supported format types"
23172341
msgstr ""

‎locale/en_US.po

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-09-06 14:55-0700\n"
10+
"POT-Creation-Date: 2018-09-12 16:24-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -123,7 +123,7 @@ msgstr ""
123123
msgid "queue overflow"
124124
msgstr ""
125125

126-
#: extmod/moduzlib.c:97
126+
#: extmod/moduzlib.c:98
127127
msgid "compression header"
128128
msgstr ""
129129

@@ -214,7 +214,7 @@ msgstr ""
214214
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
215215
msgstr ""
216216

217-
#: main.c:415
217+
#: main.c:416
218218
msgid "soft reboot\n"
219219
msgstr ""
220220

@@ -393,7 +393,7 @@ msgid "No TX pin"
393393
msgstr ""
394394

395395
#: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c:170
396-
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:153
396+
#: ports/nrf/common-hal/digitalio/DigitalInOut.c:142
397397
msgid "Cannot get pull while in output mode"
398398
msgstr ""
399399

@@ -1960,6 +1960,7 @@ msgid "buffer must be a bytes-like object"
19601960
msgstr ""
19611961

19621962
#: shared-bindings/audioio/WaveFile.c:78
1963+
#: shared-bindings/displayio/OnDiskBitmap.c:85
19631964
msgid "file must be a file opened in byte mode"
19641965
msgstr ""
19651966

@@ -2034,6 +2035,10 @@ msgstr ""
20342035
msgid "row data must be a buffer"
20352036
msgstr ""
20362037

2038+
#: shared-bindings/displayio/ColorConverter.c:72
2039+
msgid "color should be an int"
2040+
msgstr ""
2041+
20372042
#: shared-bindings/displayio/FourWire.c:55
20382043
#: shared-bindings/displayio/FourWire.c:64
20392044
msgid "displayio is a work in progress"
@@ -2064,16 +2069,16 @@ msgstr ""
20642069
msgid "palette_index should be an int"
20652070
msgstr ""
20662071

2067-
#: shared-bindings/displayio/Sprite.c:45
2072+
#: shared-bindings/displayio/Sprite.c:48
20682073
msgid "position must be 2-tuple"
20692074
msgstr ""
20702075

2071-
#: shared-bindings/displayio/Sprite.c:87
2076+
#: shared-bindings/displayio/Sprite.c:97
20722077
msgid "unsupported bitmap type"
20732078
msgstr ""
20742079

2075-
#: shared-bindings/displayio/Sprite.c:152
2076-
msgid "palette must be displayio.Palette"
2080+
#: shared-bindings/displayio/Sprite.c:162
2081+
msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter"
20772082
msgstr ""
20782083

20792084
#: shared-bindings/gamepad/GamePad.c:100
@@ -2302,6 +2307,24 @@ msgstr ""
23022307
msgid "Group full"
23032308
msgstr ""
23042309

2310+
#: shared-module/displayio/Group.c:48
2311+
msgid "Group empty"
2312+
msgstr ""
2313+
2314+
#: shared-module/displayio/OnDiskBitmap.c:49
2315+
msgid "Invalid BMP file"
2316+
msgstr ""
2317+
2318+
#: shared-module/displayio/OnDiskBitmap.c:59
2319+
#, c-format
2320+
msgid "Only Windows format, uncompressed BMP supported %d"
2321+
msgstr ""
2322+
2323+
#: shared-module/displayio/OnDiskBitmap.c:64
2324+
#, c-format
2325+
msgid "Only true color (24 bpp or higher) BMP supported %x"
2326+
msgstr ""
2327+
23052328
#: shared-module/struct/__init__.c:39
23062329
msgid "'S' and 'O' are not supported format types"
23072330
msgstr ""

0 commit comments

Comments
 (0)