mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix cppcheck variableHidingTypedef

Browse Source
This commit is contained in:
Chris Young 2014-04-05 19:32:30 +01:00
parent d907ec9b06
commit 268cda0f56
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
amiga/gui.c
View File

@ -463,7 +463,7 @@ colour_option_from_pen(UWORD pen,
struct Screen *screen, struct Screen *screen,
colour def_colour) colour def_colour)
{ {
ULONG colour[3]; ULONG colr[3];
struct DrawInfo *drinfo; struct DrawInfo *drinfo;
if((option < NSOPTION_SYS_COLOUR_START) || 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); if(pen == AMINS_SCROLLERPEN) pen = ami_system_colour_scrollbar_fgpen(drinfo);
/* Get the colour of the pen being used for "pen" */ /* 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 */ /* convert it to a color */
def_colour = ((colour[0] & 0xff000000) >> 24) | def_colour = ((colr[0] & 0xff000000) >> 24) |
((colour[1] & 0xff000000) >> 16) | ((colr[1] & 0xff000000) >> 16) |
((colour[2] & 0xff000000) >> 8); ((colr[2] & 0xff000000) >> 8);
FreeScreenDrawInfo(screen, drinfo); FreeScreenDrawInfo(screen, drinfo);
} }