godzil/ti-nesulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings/errors spotted by travis

Browse Source
This commit is contained in:
Godzil 2020-01-17 18:04:47 +00:00
parent 2ec7a9c21e
commit 4280979f87
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/os/unix/graphics.c
View File

@ -228,14 +228,14 @@ static void drawPixel(GLWindow *gw, uint32_t x, uint32_t y, uint32_t colour)
gw->videoMemory[offset + 3] = b; gw->videoMemory[offset + 3] = b;
} }
static void drawLine(GLWindow *g, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1, uint32_t colour) static void drawLine(GLWindow *g, int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t colour)
{ {
printf("%s:%s(%p, %d, %d, %d, %d, %d) @ %d\n", __FILE__, __func__, printf("%s:%s(%p, %d, %d, %d, %d, %d) @ %d\n", __FILE__, __func__,
g, x0, y0, x1, y1, colour, g, x0, y0, x1, y1, colour,
__LINE__); __LINE__);
int32_t d, dx, dy, aincr, bincr, xincr, yincr; int32_t d, dx, dy, aincr, bincr, xincr, yincr;
uint32_t x, y; int32_t x, y;
if (abs(x1 - x0) < abs(y1 - y0)) if (abs((int32_t)x1 - x0) < abs((int32_t)y1 - y0))
{ {
/* parcours par l'axe vertical */ /* parcours par l'axe vertical */
if (y0 > y1) if (y0 > y1)
@ -246,9 +246,9 @@ static void drawLine(GLWindow *g, uint32_t x0, uint32_t y0, uint32_t x1, uint32_
xincr = x1 > x0 ? 1 : -1; xincr = x1 > x0 ? 1 : -1;
dy = y1 - y0; dy = y1 - y0;
dx = abs(x1 - x0); dx = abs((int32_t)x1 - x0);
d = 2 * dx - dy; d = 2 * dx - dy;
aincr = 2 * (dx - dy); aincr = 2 * ((int32_t)dx - dy);
bincr = 2 * dx; bincr = 2 * dx;
x = x0; x = x0;
y = y0; y = y0;
@ -281,7 +281,7 @@ static void drawLine(GLWindow *g, uint32_t x0, uint32_t y0, uint32_t x1, uint32_
} }
yincr = y1 > y0 ? 1 : -1; yincr = y1 > y0 ? 1 : -1;
dx = x1 - x0; dx = x1 - x0;
dy = abs(y1 - y0); dy = abs((int32_t)y1 - y0);
d = 2 * dy - dx; d = 2 * dy - dx;
aincr = 2 * (dy - dx); aincr = 2 * (dy - dx);
bincr = 2 * dy; bincr = 2 * dy;

19
src/os/unix/graphics_dummy.c
View File

@ -120,11 +120,28 @@ int graphics_drawpixel(long x, long y, long color)
return 0; return 0;
} }
int graphics_drawline(long x, long y, long x1, long y1, long color) int graphics_drawline(uint32_t x, uint32_t y, uint32_t x1, uint32_t y1, uint32_t colour)
{ {
return 0; return 0;
} }
int graphics_drawRect(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h, uint32_t colour)
{
return 0;
}
int graphics_drawFillrect(int x0, int y0, int w, int h, uint32_t colour)
{
return 0;
}
int graphics_getScreenSize(int *w, int *h)
{
*w = 640;
*h = 320;
return 0;
}
int graphics_blit(long x, long y, long w, long h) int graphics_blit(long x, long y, long w, long h)
{ {
return 0; return 0;