From 014595bff593e51012483515adf92e21c7126f5d Mon Sep 17 00:00:00 2001 From: Bryan Siepert Date: Fri, 1 Mar 2019 07:16:14 -0800 Subject: [PATCH] fixed whitespace, clarified variable name, and updated error messages --- locale/ID.po | 9 ++++--- locale/circuitpython.pot | 9 ++++--- locale/de_DE.po | 14 +++++++--- locale/en_US.po | 9 ++++--- locale/es.po | 14 +++++++--- locale/fil.po | 14 +++++++--- locale/fr.po | 14 +++++++--- locale/it_IT.po | 14 +++++++--- locale/pt_BR.po | 14 +++++++--- shared-module/displayio/OnDiskBitmap.c | 36 +++++++++++++------------- 10 files changed, 96 insertions(+), 51 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index c0b1dafdbd..f5fadce49f 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -760,14 +760,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "Hanya 8 atau 16 bit mono dengan " #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" msgid "Only slices with step=1 (aka None) are supported" diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index ea6b26c3f8..0808ae43e5 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -734,14 +734,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "" #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" msgid "Only slices with step=1 (aka None) are supported" diff --git a/locale/de_DE.po b/locale/de_DE.po index ff9cafc763..941a5d5d16 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: Pascal Deneaux\n" "Language-Team: Sebastian Plamauer, Pascal Deneaux\n" @@ -752,15 +752,18 @@ msgid "Only 8 or 16 bit mono with " msgstr "Nur 8 oder 16 bit mono mit " #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "" "Es werden nur Bitmaps mit einer Farbtiefe von 8 Bit oder weniger unterstützt" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" msgid "Only slices with step=1 (aka None) are supported" @@ -2138,3 +2141,6 @@ msgstr "y Wert außerhalb der Grenzen" msgid "zero step" msgstr "" + +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d" diff --git a/locale/en_US.po b/locale/en_US.po index 45596fb620..01cbaeb510 100644 --- a/locale/en_US.po +++ b/locale/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: \n" @@ -734,14 +734,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "" #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" msgid "Only slices with step=1 (aka None) are supported" diff --git a/locale/es.po b/locale/es.po index 996d58df66..a4eceb1fb8 100644 --- a/locale/es.po +++ b/locale/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-08-24 22:56-0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -774,14 +774,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "Solo mono de 8 o 16 bit con " #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Solo formato Windows, BMP sin comprimir soportado %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "Solo se admiten bit maps de color de 8 bits o menos" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" #, fuzzy @@ -2164,5 +2167,8 @@ msgstr "address fuera de límites" msgid "zero step" msgstr "paso cero" +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Solo formato Windows, BMP sin comprimir soportado %d" + #~ msgid "Only true color (24 bpp or higher) BMP supported %x" #~ msgstr "Solo color verdadero (24 bpp o superior) BMP admitido %x" diff --git a/locale/fil.po b/locale/fil.po index af5046d7c2..fb6002a574 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-12-20 22:15-0800\n" "Last-Translator: Timothy \n" "Language-Team: fil\n" @@ -772,14 +772,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "Tanging 8 o 16 na bit mono na may " #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "Tanging bit maps na may 8 bit color o mas mababa ang supportado" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" #, fuzzy @@ -2170,5 +2173,8 @@ msgstr "wala sa sakop ang address" msgid "zero step" msgstr "zero step" +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d" + #~ msgid "Only true color (24 bpp or higher) BMP supported %x" #~ msgstr "Dapat true color (24 bpp o mas mataas) BMP lamang ang supportado %x" diff --git a/locale/fr.po b/locale/fr.po index 3fde90bde7..c937a4b5ba 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-12-23 20:05+0100\n" "Last-Translator: Pierrick Couturier \n" "Language-Team: fr\n" @@ -776,14 +776,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "Uniquement 8 ou 16 bit mono avec " #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Seul les BMP non-compressé au format Windows sont supportés %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "Seules les bitmaps de 8bits par couleur ou moins sont supportées" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" #, fuzzy @@ -2194,5 +2197,8 @@ msgstr "adresse hors limites" msgid "zero step" msgstr "'step' nul" +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Seul les BMP non-compressé au format Windows sont supportés %d" + #~ msgid "Only true color (24 bpp or higher) BMP supported %x" #~ msgstr "Seul les BMP 24bits ou plus sont supportés %x" diff --git a/locale/it_IT.po b/locale/it_IT.po index ea1a42b119..64fb22128f 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-10-02 16:27+0200\n" "Last-Translator: Enrico Paganin \n" "Language-Team: \n" @@ -771,14 +771,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "" #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Formato solo di Windows, BMP non compresso supportato %d" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "Sono supportate solo bitmap con colori a 8 bit o meno" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" #, fuzzy @@ -2166,5 +2169,8 @@ msgstr "indirizzo fuori limite" msgid "zero step" msgstr "zero step" +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Formato solo di Windows, BMP non compresso supportato %d" + #~ msgid "Only true color (24 bpp or higher) BMP supported %x" #~ msgstr "Solo BMP true color (24 bpp o superiore) sono supportati %x" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 8477e14786..cf46dfbc58 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-28 23:07-0800\n" +"POT-Creation-Date: 2019-03-01 07:16-0800\n" "PO-Revision-Date: 2018-10-02 21:14-0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -760,14 +760,17 @@ msgid "Only 8 or 16 bit mono with " msgstr "" #, c-format -msgid "Only Windows format, uncompressed BMP supported %d" -msgstr "Apenas formato Windows, BMP descomprimido suportado" +msgid "" +"Only Windows format, uncompressed BMP supported: given header size is %d" +msgstr "" msgid "Only bit maps of 8 bit color or less are supported" msgstr "Apenas bit maps de cores de 8 bit ou menos são suportados" #, c-format -msgid "Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d" +msgid "" +"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp " +"given" msgstr "" msgid "Only slices with step=1 (aka None) are supported" @@ -2114,5 +2117,8 @@ msgstr "" msgid "zero step" msgstr "passo zero" +#~ msgid "Only Windows format, uncompressed BMP supported %d" +#~ msgstr "Apenas formato Windows, BMP descomprimido suportado" + #~ msgid "Only true color (24 bpp or higher) BMP supported %x" #~ msgstr "Apenas cores verdadeiras (24 bpp ou maior) BMP suportadas" diff --git a/shared-module/displayio/OnDiskBitmap.c b/shared-module/displayio/OnDiskBitmap.c index 76d8fb2d14..92735e53cf 100644 --- a/shared-module/displayio/OnDiskBitmap.c +++ b/shared-module/displayio/OnDiskBitmap.c @@ -93,11 +93,11 @@ void common_hal_displayio_ondiskbitmap_construct(displayio_ondiskbitmap_t *self, } else if (!(header_size == 12 || header_size == 40 || header_size == 108 || header_size == 124)) { - mp_raise_ValueError_varg(translate("Only Windows format, uncompressed BMP supported %d"), header_size); + mp_raise_ValueError_varg(translate("Only Windows format, uncompressed BMP supported: given header size is %d"), header_size); } if ((bits_per_pixel == 4 ) || (( bits_per_pixel == 8) && (number_of_colors == 0))) { - mp_raise_ValueError_varg(translate("Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d"), bits_per_pixel); + mp_raise_ValueError_varg(translate("Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp given"), bits_per_pixel); } if (self->bits_per_pixel >=8){ @@ -133,8 +133,8 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s // We don't cache here because the underlying FS caches sectors. f_lseek(&self->file->fp, location); UINT bytes_read; - uint32_t pixel = 0; // this name is stale - uint32_t result = f_read(&self->file->fp, &pixel, bytes_per_pixel, &bytes_read); + uint32_t pixel_data = 0; // this name is stale + uint32_t result = f_read(&self->file->fp, &pixel_data, bytes_per_pixel, &bytes_read); if (result == FR_OK) { uint32_t tmp = 0; uint8_t red; @@ -142,34 +142,34 @@ uint32_t common_hal_displayio_ondiskbitmap_get_pixel(displayio_ondiskbitmap_t *s uint8_t blue; if (self->bits_per_pixel == 1){ uint8_t bit_offset = x%8; - tmp = ( pixel & (0x80 >> (bit_offset))) >> (7 - bit_offset); + tmp = ( pixel_data & (0x80 >> (bit_offset))) >> (7 - bit_offset); if (tmp == 1) { return 0x00FFFFFF; } else { return 0x00000000; } } else if (bytes_per_pixel == 1){ - blue = ((self->palette_data[pixel] & 0xFF) >> 0); - red = ((self->palette_data[pixel] & 0xFF0000) >> 16); - green = ((self->palette_data[pixel] & 0xFF00) >> 8); + blue = ((self->palette_data[pixel_data] & 0xFF) >> 0); + red = ((self->palette_data[pixel_data] & 0xFF0000) >> 16); + green = ((self->palette_data[pixel_data] & 0xFF00) >> 8); tmp = (red << 16 | green << 8 | blue ); return tmp; } else if (bytes_per_pixel == 2) { - if (self->g_bitmask == 0x07e0){ // 565 - red =((pixel & self->r_bitmask) >>11); - green = ((pixel & self->g_bitmask) >>5); - blue = ((pixel & self->b_bitmask) >> 0); + if (self->g_bitmask == 0x07e0) { // 565 + red =((pixel_data & self->r_bitmask) >>11); + green = ((pixel_data & self->g_bitmask) >>5); + blue = ((pixel_data & self->b_bitmask) >> 0); } else { // 555 - red =((pixel & self->r_bitmask) >>10); - green = ((pixel & self->g_bitmask) >>4); - blue = ((pixel & self->b_bitmask) >> 0); + red =((pixel_data & self->r_bitmask) >>10); + green = ((pixel_data & self->g_bitmask) >>4); + blue = ((pixel_data & self->b_bitmask) >> 0); } tmp = (red << 19 | green << 10 | blue << 3); return tmp; - }else if ((bytes_per_pixel == 4) && (self->bitfield_compressed)){ - return pixel & 0x00FFFFFF; + } else if ((bytes_per_pixel == 4) && (self->bitfield_compressed)) { + return pixel_data & 0x00FFFFFF; } else { - return pixel; + return pixel_data; } } return 0;