mirror
/
pimoroni-pico
kopia lustrzana https://github.com/pimoroni/pimoroni-pico
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

PNGDEC: Support for 1bpp.

pull/907/head
Phil Howard 2024-02-27 13:26:30 +00:00
rodzic ab64fcaccc
commit 10221066dd
1 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
micropython/modules/pngdec/pngdec.cpp
Wyświetl plik

@ -186,18 +186,23 @@ mp_event_handle_nowait();
} else if (pDraw->iPixelType == PNG_PIXEL_INDEXED) { } else if (pDraw->iPixelType == PNG_PIXEL_INDEXED) {
for(int x = 0; x < pDraw->iWidth; x++) { for(int x = 0; x < pDraw->iWidth; x++) {
uint8_t i = 0; uint8_t i = 0;
if(pDraw->iBpp == 8) { if(pDraw->iBpp == 8) { // 8bpp
i = *pixel++; i = *pixel++;
} else if (pDraw->iBpp == 4) { } else if (pDraw->iBpp == 4) { // 4bpp
i = *pixel; i = *pixel;
i >>= (x & 0b1) ? 0 : 4; i >>= (x & 0b1) ? 0 : 4;
i &= 0xf; i &= 0xf;
if (x & 1) pixel++; if (x & 1) pixel++;
} else { } else if (pDraw->iBpp == 2) { // 2bpp
i = *pixel; i = *pixel;
i >>= 6 - ((x & 0b11) << 1); i >>= 6 - ((x & 0b11) << 1);
i &= 0x3; i &= 0x3;
if ((x & 0b11) == 0b11) pixel++; if ((x & 0b11) == 0b11) pixel++;
} else { // 1bpp
i = *pixel;
i >>= 7 - (x & 0b111);
i &= 0b1;
if ((x & 0b111) == 0b111) pixel++;
} }
if(x < target->source.x || x >= target->source.x + target->source.w) continue; if(x < target->source.x || x >= target->source.x + target->source.w) continue;
// grab the colour from the palette // grab the colour from the palette
@ -243,7 +248,6 @@ mp_event_handle_nowait();
} }
} }
} }
} else { } else {
current_graphics->set_pen(r, g, b); current_graphics->set_pen(r, g, b);
current_graphics->rectangle({current_position.x, current_position.y, scale.x, scale.y}); current_graphics->rectangle({current_position.x, current_position.y, scale.x, scale.y});