Fix cppcheck variableHidingTypedef
This commit is contained in:
parent
d907ec9b06
commit
268cda0f56
10
amiga/gui.c
10
amiga/gui.c
|
@ -463,7 +463,7 @@ colour_option_from_pen(UWORD pen,
|
|||
struct Screen *screen,
|
||||
colour def_colour)
|
||||
{
|
||||
ULONG colour[3];
|
||||
ULONG colr[3];
|
||||
struct DrawInfo *drinfo;
|
||||
|
||||
if((option < NSOPTION_SYS_COLOUR_START) ||
|
||||
|
@ -479,12 +479,12 @@ colour_option_from_pen(UWORD pen,
|
|||
if(pen == AMINS_SCROLLERPEN) pen = ami_system_colour_scrollbar_fgpen(drinfo);
|
||||
|
||||
/* Get the colour of the pen being used for "pen" */
|
||||
GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colour);
|
||||
GetRGB32(screen->ViewPort.ColorMap, drinfo->dri_Pens[pen], 1, (ULONG *)&colr);
|
||||
|
||||
/* convert it to a color */
|
||||
def_colour = ((colour[0] & 0xff000000) >> 24) |
|
||||
((colour[1] & 0xff000000) >> 16) |
|
||||
((colour[2] & 0xff000000) >> 8);
|
||||
def_colour = ((colr[0] & 0xff000000) >> 24) |
|
||||
((colr[1] & 0xff000000) >> 16) |
|
||||
((colr[2] & 0xff000000) >> 8);
|
||||
|
||||
FreeScreenDrawInfo(screen, drinfo);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue