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
@@ -509,8 +509,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
*dest++ = '\322';
// *dest++ = '1'+qr.quot;
strncpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name));
dest[sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name)] = '\0';
strcpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name);
}
#endif
}
+1 -1
View File
@@ -220,7 +220,7 @@ void lcdSetContrast();
void lcdRefresh();
#endif
const char * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
uint8_t * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
const char * writeScreenshot();
#if defined(BOOT)
@@ -458,7 +458,7 @@ void menuGeneralSdManager(evt_t _event)
char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1);
if (ext && !strcasecmp(ext, BITMAPS_EXT)) {
if (lastPos != menuVerticalPosition) {
if (bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
if (!bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
memcpy(modelBitmap, logo_taranis, MODEL_BITMAP_SIZE);
}
}