1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00

fix gcc 10 warnings

This commit is contained in:
Jonathan Hudson 2020-05-22 15:52:24 +01:00
parent 2501949e98
commit 16d331df42
2 changed files with 5 additions and 6 deletions

View file

@ -192,9 +192,9 @@ int displayWriteCharWithAttr(displayPort_t *instance, uint8_t x, uint8_t y, uint
return -1;
}
if (displayAttributesRequireEmulation(instance, attr)) {
char ec;
if (displayEmulateTextAttributes(instance, &ec, 1, &attr)) {
c = ec;
char ec[2];
if (displayEmulateTextAttributes(instance, ec, 1, &attr)) {
c = ec[0];
}
}
instance->posX = x + 1;
@ -317,4 +317,3 @@ void displayInit(displayPort_t *instance, const displayPortVTable_t *vTable)
instance->maxChar = 0;
displayUpdateMaxChar(instance);
}

View file

@ -259,14 +259,14 @@ static void setLineOutlineType(displayCanvas_t *displayCanvas, displayCanvasOutl
{
UNUSED(displayCanvas);
frskyOSDSetLineOutlineType(outlineType);
frskyOSDSetLineOutlineType((frskyOSDLineOutlineType_e)outlineType);
}
static void setLineOutlineColor(displayCanvas_t *displayCanvas, displayCanvasColor_e outlineColor)
{
UNUSED(displayCanvas);
frskyOSDSetLineOutlineColor(outlineColor);
frskyOSDSetLineOutlineColor((frskyOSDColor_e)outlineColor);
}
static void clipToRect(displayCanvas_t *displayCanvas, int x, int y, int w, int h)