Compilation fixes

This commit is contained in:
Bertrand Songis
2016-02-21 19:35:30 +01:00
parent 358badfed9
commit 103fea7b98
5 changed files with 11 additions and 13 deletions
+1 -2
View File
@@ -38,14 +38,13 @@ bool loadModelBitmap(char * name, uint8_t * bitmap)
char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
strncpy(lfn+sizeof(BITMAPS_PATH), name, len);
strcpy(lfn+sizeof(BITMAPS_PATH)+len, BITMAPS_EXT);
if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT) == 0) {
if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
return true;
}
}
// In all error cases, we set the default logo
memcpy(bitmap, logo_taranis, MODEL_BITMAP_SIZE);
return false;
}
#endif