piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

JPEG also works

Browse Source
This commit is contained in:
Damjan Adamic
2016-01-02 20:48:28 +01:00
parent 03c9b2c4a2
commit acaa77daab
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/horus/lcd.h
+1 -1
View File
@@ -311,7 +311,7 @@ void lcdSetContrast();
#define lcdOff(...)
const char * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
const char * pngLoad(uint8_t * bmp, const char * filename, uint16_t width, uint16_t height);
const char * imgLoad(uint8_t * bmp, const char * filename, uint16_t width, uint16_t height);
#if defined(BOOT)
radio/src/gui/horus/menu_general_sdmanager.cpp
+2 -2
View File
@@ -367,10 +367,10 @@ bool menuGeneralSdManager(evt_t _event)
lcdDrawBitmap(LCD_W/2, (LCD_H-MODEL_BITMAP_HEIGHT)/2, modelBitmap);
}
if (ext && !strcasecmp(ext, ".png")) {
if (ext && (!strcasecmp(ext, ".png") || !strcasecmp(ext, ".jpg"))) {
if (lastBitmap != menuVerticalPosition) {
lastBitmap = menuVerticalPosition;
if (pngLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
if (imgLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
((uint32_t *)modelBitmap)[0] = 0;
}
}