TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass unsigned x/y to gr_pixel

Browse source
This commit is contained in:
Kp 2015-05-09 17:39:00 +00:00
parent cf87ebe54d
commit 6dccb811b7
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/2d/pixel.cpp
View file

@ -30,8 +30,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "ogl_init.h"
#endif
void gr_upixel( int x, int y )
void gr_upixel(unsigned x, unsigned y)
{
switch (TYPE)
{
@ -46,9 +45,10 @@ void gr_upixel( int x, int y )
}
}
void gr_pixel( int x, int y )
void gr_pixel(unsigned x, unsigned y)
{
if ((x<0) || (y<0) || (x>=GWIDTH) || (y>=GHEIGHT)) return;
if (unlikely(x >= GWIDTH || y >= GHEIGHT))
return;
gr_upixel (x, y);
}
@ -69,6 +69,7 @@ static inline void gr_bm_upixel(grs_bitmap &bm, uint_fast32_t x, uint_fast32_t y
void gr_bm_pixel(grs_bitmap &bm, uint_fast32_t x, uint_fast32_t y, uint8_t color )
{
if (x >= bm.bm_w || y >= bm.bm_h) return;
if (unlikely(x >= bm.bm_w || y >= bm.bm_h))
return;
gr_bm_upixel (bm, x, y, color);
}

4
common/include/gr.h
View file

@ -311,8 +311,8 @@ void gr_setcolor(color_t color);
void gr_settransblend(int fade_level, ubyte blend_func);
// Draws a point into the current canvas in the current color and drawmode.
void gr_pixel(int x,int y);
void gr_upixel(int x,int y);
void gr_pixel(unsigned x, unsigned y);
void gr_upixel(unsigned x, unsigned y);
// Gets a pixel;
unsigned char gr_gpixel(const grs_bitmap &bitmap, int x, int y );