diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-04-05 20:23:29 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-04-05 20:26:40 +0100 |
| commit | ba5bae389b9bfed07e94fc8ec3191f4dcfa714f0 (patch) | |
| tree | 1541ccf0e6bc2eaa76fb47317650fdf5347008ea /amiga/plotters.c | |
| parent | 65adc1712123f81847a85ce0374acc5a741368ec (diff) | |
| download | netsurf-ba5bae389b9bfed07e94fc8ec3191f4dcfa714f0.tar.gz netsurf-ba5bae389b9bfed07e94fc8ec3191f4dcfa714f0.tar.bz2 | |
Fix some cppcheck variableHidingTypedef warnings
Diffstat (limited to 'amiga/plotters.c')
| -rwxr-xr-x | amiga/plotters.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/amiga/plotters.c b/amiga/plotters.c index 7b8ad1281..0893c552c 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -239,16 +239,16 @@ void ami_clearclipreg(struct gui_globals *gg) gg->rect.MaxY = scrn->Height-1; } -static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colour) +static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colr) { struct ami_plot_pen *node; ULONG pen = ObtainBestPenA(scrn->ViewPort.ColorMap, - (colour & 0x000000ff) << 24, - (colour & 0x0000ff00) << 16, - (colour & 0x00ff0000) << 8, + (colr & 0x000000ff) << 24, + (colr & 0x0000ff00) << 16, + (colr & 0x00ff0000) << 8, NULL); - if(pen == -1) LOG(("WARNING: Cannot allocate pen for ABGR:%lx", colour)); + if(pen == -1) LOG(("WARNING: Cannot allocate pen for ABGR:%lx", colr)); if(shared_pens != NULL) { if(node = (struct ami_plot_pen *)AllocVecTagList(sizeof(struct ami_plot_pen), NULL)) { @@ -278,26 +278,26 @@ void ami_plot_release_pens(struct MinList *shared_pens) }while(node = nnode); } -static void ami_plot_setapen(ULONG colour) +static void ami_plot_setapen(ULONG colr) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_APenColor, - ns_color_to_nscss(colour), + ns_color_to_nscss(colr), TAG_DONE); } else { - ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); + ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colr); if(pen != -1) SetAPen(glob->rp, pen); } } -static void ami_plot_setopen(ULONG colour) +static void ami_plot_setopen(ULONG colr) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_OPenColor, - ns_color_to_nscss(colour), + ns_color_to_nscss(colr), TAG_DONE); } else { - ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); + ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colr); if(pen != -1) SetOPen(glob->rp, pen); } } |