Skip to content

Commit 81fe806

Browse files
committed
Properly calculate BPP for displayio.Bitmap
Fix adafruit#1669
1 parent 7bac10a commit 81fe806

File tree

11 files changed

+85
-64
lines changed

11 files changed

+85
-64
lines changed

locale/ID.po

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
11+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -762,14 +762,10 @@ msgid "Frequency captured is above capability. Capture Paused."
762762
msgstr ""
763763

764764
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
765-
#: shared-bindings/busio/SPI.c
765+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
766766
msgid "Function requires lock"
767767
msgstr ""
768768

769-
#: shared-bindings/busio/I2C.c
770-
msgid "Function requires lock."
771-
msgstr ""
772-
773769
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
774770
msgid "GPIO16 does not support pull up."
775771
msgstr "GPIO16 tidak mendukung pull up"
@@ -2838,6 +2834,10 @@ msgstr ""
28382834
msgid "unsupported types for %q: '%s', '%s'"
28392835
msgstr ""
28402836

2837+
#: shared-bindings/displayio/Bitmap.c
2838+
msgid "value_count must be > 0"
2839+
msgstr ""
2840+
28412841
#: ports/esp8266/modnetwork.c
28422842
msgid "wifi_set_ip_info() failed"
28432843
msgstr "wifi_set_ip_info() gagal"

locale/circuitpython.pot

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
11+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -737,14 +737,10 @@ msgid "Frequency captured is above capability. Capture Paused."
737737
msgstr ""
738738

739739
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
740-
#: shared-bindings/busio/SPI.c
740+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
741741
msgid "Function requires lock"
742742
msgstr ""
743743

744-
#: shared-bindings/busio/I2C.c
745-
msgid "Function requires lock."
746-
msgstr ""
747-
748744
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
749745
msgid "GPIO16 does not support pull up."
750746
msgstr ""
@@ -2789,6 +2785,10 @@ msgstr ""
27892785
msgid "unsupported types for %q: '%s', '%s'"
27902786
msgstr ""
27912787

2788+
#: shared-bindings/displayio/Bitmap.c
2789+
msgid "value_count must be > 0"
2790+
msgstr ""
2791+
27922792
#: ports/esp8266/modnetwork.c
27932793
msgid "wifi_set_ip_info() failed"
27942794
msgstr ""

locale/de_DE.po

Lines changed: 10 additions & 6 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: 2019-03-25 14:08+0100\n"
10+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -742,14 +742,10 @@ msgid "Frequency captured is above capability. Capture Paused."
742742
msgstr ""
743743

744744
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
745-
#: shared-bindings/busio/SPI.c
745+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
746746
msgid "Function requires lock"
747747
msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
748748

749-
#: shared-bindings/busio/I2C.c
750-
msgid "Function requires lock."
751-
msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
752-
753749
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
754750
msgid "GPIO16 does not support pull up."
755751
msgstr "GPIO16 unterstützt pull up nicht"
@@ -2851,6 +2847,10 @@ msgstr "nicht unterstützter Typ für Operator"
28512847
msgid "unsupported types for %q: '%s', '%s'"
28522848
msgstr "nicht unterstützte Typen für %q: '%s', '%s'"
28532849

2850+
#: shared-bindings/displayio/Bitmap.c
2851+
msgid "value_count must be > 0"
2852+
msgstr ""
2853+
28542854
#: ports/esp8266/modnetwork.c
28552855
msgid "wifi_set_ip_info() failed"
28562856
msgstr "wifi_set_ip_info() fehlgeschlagen"
@@ -2889,5 +2889,9 @@ msgstr ""
28892889
#~ msgid "Failed to read attribute value, err %0x04x"
28902890
#~ msgstr "Kann den Attributwert nicht lesen. Status: 0x%04x"
28912891

2892+
#~ msgid "Function requires lock."
2893+
#~ msgstr ""
2894+
#~ "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
2895+
28922896
#~ msgid "Only Windows format, uncompressed BMP supported %d"
28932897
#~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d"

locale/en_US.po

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
10+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -737,14 +737,10 @@ msgid "Frequency captured is above capability. Capture Paused."
737737
msgstr ""
738738

739739
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
740-
#: shared-bindings/busio/SPI.c
740+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
741741
msgid "Function requires lock"
742742
msgstr ""
743743

744-
#: shared-bindings/busio/I2C.c
745-
msgid "Function requires lock."
746-
msgstr ""
747-
748744
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
749745
msgid "GPIO16 does not support pull up."
750746
msgstr ""
@@ -2789,6 +2785,10 @@ msgstr ""
27892785
msgid "unsupported types for %q: '%s', '%s'"
27902786
msgstr ""
27912787

2788+
#: shared-bindings/displayio/Bitmap.c
2789+
msgid "value_count must be > 0"
2790+
msgstr ""
2791+
27922792
#: ports/esp8266/modnetwork.c
27932793
msgid "wifi_set_ip_info() failed"
27942794
msgstr ""

locale/en_x_pirate.po

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
10+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -741,14 +741,10 @@ msgid "Frequency captured is above capability. Capture Paused."
741741
msgstr ""
742742

743743
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
744-
#: shared-bindings/busio/SPI.c
744+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
745745
msgid "Function requires lock"
746746
msgstr ""
747747

748-
#: shared-bindings/busio/I2C.c
749-
msgid "Function requires lock."
750-
msgstr ""
751-
752748
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
753749
msgid "GPIO16 does not support pull up."
754750
msgstr ""
@@ -2793,6 +2789,10 @@ msgstr ""
27932789
msgid "unsupported types for %q: '%s', '%s'"
27942790
msgstr ""
27952791

2792+
#: shared-bindings/displayio/Bitmap.c
2793+
msgid "value_count must be > 0"
2794+
msgstr ""
2795+
27962796
#: ports/esp8266/modnetwork.c
27972797
msgid "wifi_set_ip_info() failed"
27982798
msgstr ""

locale/es.po

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-03-25 14:08+0100\n"
11+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1212
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -767,14 +767,10 @@ msgid "Frequency captured is above capability. Capture Paused."
767767
msgstr ""
768768

769769
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
770-
#: shared-bindings/busio/SPI.c
770+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
771771
msgid "Function requires lock"
772772
msgstr "La función requiere lock"
773773

774-
#: shared-bindings/busio/I2C.c
775-
msgid "Function requires lock."
776-
msgstr "La función requiere lock"
777-
778774
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
779775
msgid "GPIO16 does not support pull up."
780776
msgstr "GPIO16 no soporta pull up."
@@ -2874,6 +2870,10 @@ msgstr "tipo de operador no soportado"
28742870
msgid "unsupported types for %q: '%s', '%s'"
28752871
msgstr "tipos no soportados para %q: '%s', '%s'"
28762872

2873+
#: shared-bindings/displayio/Bitmap.c
2874+
msgid "value_count must be > 0"
2875+
msgstr ""
2876+
28772877
#: ports/esp8266/modnetwork.c
28782878
msgid "wifi_set_ip_info() failed"
28792879
msgstr "wifi_set_ip_info() ha fallado"
@@ -2916,6 +2916,9 @@ msgstr "paso cero"
29162916
#~ msgid "Failed to read attribute value, err %0x04x"
29172917
#~ msgstr "No se puede leer el valor del atributo. status 0x%02x"
29182918

2919+
#~ msgid "Function requires lock."
2920+
#~ msgstr "La función requiere lock"
2921+
29192922
#~ msgid "Only Windows format, uncompressed BMP supported %d"
29202923
#~ msgstr "Solo formato Windows, BMP sin comprimir soportado %d"
29212924

locale/fil.po

Lines changed: 9 additions & 6 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: 2019-03-25 14:08+0100\n"
10+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -765,14 +765,10 @@ msgid "Frequency captured is above capability. Capture Paused."
765765
msgstr ""
766766

767767
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
768-
#: shared-bindings/busio/SPI.c
768+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
769769
msgid "Function requires lock"
770770
msgstr "Function nangangailangan ng lock"
771771

772-
#: shared-bindings/busio/I2C.c
773-
msgid "Function requires lock."
774-
msgstr "Kailangan ng lock ang function."
775-
776772
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
777773
msgid "GPIO16 does not support pull up."
778774
msgstr "Walang pull down support ang GPI016."
@@ -2880,6 +2876,10 @@ msgstr "hindi sinusuportahang type para sa operator"
28802876
msgid "unsupported types for %q: '%s', '%s'"
28812877
msgstr "hindi sinusuportahang type para sa %q: '%s', '%s'"
28822878

2879+
#: shared-bindings/displayio/Bitmap.c
2880+
msgid "value_count must be > 0"
2881+
msgstr ""
2882+
28832883
#: ports/esp8266/modnetwork.c
28842884
msgid "wifi_set_ip_info() failed"
28852885
msgstr "nabigo ang wifi_set_ip_info()"
@@ -2922,6 +2922,9 @@ msgstr "zero step"
29222922
#~ msgid "Failed to read attribute value, err %0x04x"
29232923
#~ msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX"
29242924

2925+
#~ msgid "Function requires lock."
2926+
#~ msgstr "Kailangan ng lock ang function."
2927+
29252928
#~ msgid "Only Windows format, uncompressed BMP supported %d"
29262929
#~ msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d"
29272930

locale/fr.po

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-03-25 14:08+0100\n"
10+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1111
"PO-Revision-Date: 2018-12-23 20:05+0100\n"
1212
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1313
"Language-Team: fr\n"
@@ -764,14 +764,10 @@ msgid "Frequency captured is above capability. Capture Paused."
764764
msgstr ""
765765

766766
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
767-
#: shared-bindings/busio/SPI.c
767+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
768768
msgid "Function requires lock"
769769
msgstr "La fonction nécessite un verrou"
770770

771-
#: shared-bindings/busio/I2C.c
772-
msgid "Function requires lock."
773-
msgstr "La fonction nécessite un verrou."
774-
775771
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
776772
msgid "GPIO16 does not support pull up."
777773
msgstr "le GPIO16 ne supporte pas le tirage (pull-up)"
@@ -2902,6 +2898,10 @@ msgstr "type non supporté pour l'opérateur"
29022898
msgid "unsupported types for %q: '%s', '%s'"
29032899
msgstr "type non supporté pour %q: '%s', '%s'"
29042900

2901+
#: shared-bindings/displayio/Bitmap.c
2902+
msgid "value_count must be > 0"
2903+
msgstr ""
2904+
29052905
#: ports/esp8266/modnetwork.c
29062906
msgid "wifi_set_ip_info() failed"
29072907
msgstr "wifi_set_ip_info() a échoué"
@@ -2945,6 +2945,9 @@ msgstr "'step' nul"
29452945
#~ msgid "Failed to read attribute value, err %0x04x"
29462946
#~ msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX"
29472947

2948+
#~ msgid "Function requires lock."
2949+
#~ msgstr "La fonction nécessite un verrou."
2950+
29482951
#~ msgid "Only Windows format, uncompressed BMP supported %d"
29492952
#~ msgstr "Seul les BMP non-compressé au format Windows sont supportés %d"
29502953

locale/it_IT.po

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
11+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
1414
"Language-Team: \n"
@@ -764,14 +764,10 @@ msgid "Frequency captured is above capability. Capture Paused."
764764
msgstr ""
765765

766766
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
767-
#: shared-bindings/busio/SPI.c
767+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
768768
msgid "Function requires lock"
769769
msgstr ""
770770

771-
#: shared-bindings/busio/I2C.c
772-
msgid "Function requires lock."
773-
msgstr ""
774-
775771
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
776772
msgid "GPIO16 does not support pull up."
777773
msgstr "GPIO16 non supporta pull-up"
@@ -2876,6 +2872,10 @@ msgstr "tipo non supportato per l'operando"
28762872
msgid "unsupported types for %q: '%s', '%s'"
28772873
msgstr "tipi non supportati per %q: '%s', '%s'"
28782874

2875+
#: shared-bindings/displayio/Bitmap.c
2876+
msgid "value_count must be > 0"
2877+
msgstr ""
2878+
28792879
#: ports/esp8266/modnetwork.c
28802880
msgid "wifi_set_ip_info() failed"
28812881
msgstr "wifi_set_ip_info() faillito"

locale/pt_BR.po

Lines changed: 6 additions & 6 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: 2019-03-25 14:08+0100\n"
11+
"POT-Creation-Date: 2019-03-25 19:40+0100\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -757,14 +757,10 @@ msgid "Frequency captured is above capability. Capture Paused."
757757
msgstr ""
758758

759759
#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c
760-
#: shared-bindings/busio/SPI.c
760+
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
761761
msgid "Function requires lock"
762762
msgstr ""
763763

764-
#: shared-bindings/busio/I2C.c
765-
msgid "Function requires lock."
766-
msgstr ""
767-
768764
#: ports/esp8266/common-hal/digitalio/DigitalInOut.c
769765
msgid "GPIO16 does not support pull up."
770766
msgstr "GPIO16 não suporta pull up."
@@ -2826,6 +2822,10 @@ msgstr ""
28262822
msgid "unsupported types for %q: '%s', '%s'"
28272823
msgstr ""
28282824

2825+
#: shared-bindings/displayio/Bitmap.c
2826+
msgid "value_count must be > 0"
2827+
msgstr ""
2828+
28292829
#: ports/esp8266/modnetwork.c
28302830
msgid "wifi_set_ip_info() failed"
28312831
msgstr "wifi_set_ip_info() falhou"

0 commit comments

Comments
 (0)