eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-29 16:09:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed build warnings

Browse source
This commit is contained in:
Sam Lantinga 2024-02-03 11:23:16 -08:00
parent c02aaebccc
commit c3e3ad6140
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/testautomation_pen.c
View file

@ -255,7 +255,7 @@ static void _pen_trackGCSweep(pen_testdata *tracker)
/* Finds a number of unused pen IDs (does not allocate them). Also initialises GUIDs. */ /* Finds a number of unused pen IDs (does not allocate them). Also initialises GUIDs. */
static void _pen_unusedIDs(pen_testdata *tracker, int count) static void _pen_unusedIDs(pen_testdata *tracker, int count)
{ {
static int guidmod = 0; /* Ensure uniqueness as long as we use no more than 256 test pens */ static Uint8 guidmod = 0; /* Ensure uniqueness as long as we use no more than 256 test pens */
Uint32 synthetic_penid = 1000u; Uint32 synthetic_penid = 1000u;
int index = 0; int index = 0;
@ -270,7 +270,7 @@ static void _pen_unusedIDs(pen_testdata *tracker, int count)
} }
tracker->ids[index] = synthetic_penid; tracker->ids[index] = synthetic_penid;
for (k = 0; k < 15; ++k) { for (k = 0; k < 15; ++k) {
tracker->guids[index].data[k] = (16 * k) + index; tracker->guids[index].data[k] = (Uint8)((16 * k) + index);
} }
tracker->guids[index].data[15] = ++guidmod; tracker->guids[index].data[15] = ++guidmod;
@ -573,7 +573,7 @@ _pen_simulate(simulated_pen_action *steps, int *step_counter, SDL_Pen *simulated
case SIMPEN_ACTION_PRESS: case SIMPEN_ACTION_PRESS:
mask = (1 << (step.index - 1)); mask = (1 << (step.index - 1));
simpen->last.buttons |= mask; simpen->last.buttons |= mask;
SDLTest_AssertCheck(SDL_SendPenButton(0, simpen->header.id, SDL_PRESSED, step.index), SDLTest_AssertCheck(SDL_SendPenButton(0, simpen->header.id, SDL_PRESSED, (Uint8)step.index),
"SIMPEN_ACTION_PRESS [pen %d]: button %d (mask %x)", step.pen_index, step.index, mask); "SIMPEN_ACTION_PRESS [pen %d]: button %d (mask %x)", step.pen_index, step.index, mask);
done = SDL_TRUE; done = SDL_TRUE;
break; break;
@ -581,7 +581,7 @@ _pen_simulate(simulated_pen_action *steps, int *step_counter, SDL_Pen *simulated
case SIMPEN_ACTION_RELEASE: case SIMPEN_ACTION_RELEASE:
mask = ~(1 << (step.index - 1)); mask = ~(1 << (step.index - 1));
simpen->last.buttons &= mask; simpen->last.buttons &= mask;
SDLTest_AssertCheck(SDL_SendPenButton(0, simpen->header.id, SDL_RELEASED, step.index), SDLTest_AssertCheck(SDL_SendPenButton(0, simpen->header.id, SDL_RELEASED, (Uint8)step.index),
"SIMPEN_ACTION_RELEASE [pen %d]: button %d (mask %x)", step.pen_index, step.index, mask); "SIMPEN_ACTION_RELEASE [pen %d]: button %d (mask %x)", step.pen_index, step.index, mask);
done = SDL_TRUE; done = SDL_TRUE;
break; break;
@ -1096,7 +1096,7 @@ pen_buttonReporting(void *arg)
SDL_bool found_event = SDL_FALSE; SDL_bool found_event = SDL_FALSE;
pen_state |= (1 << (button_nr - 1)); pen_state |= (1 << (button_nr - 1));
SDL_SendPenButton(0, ptest.ids[pen_nr], SDL_PRESSED, button_nr); SDL_SendPenButton(0, ptest.ids[pen_nr], SDL_PRESSED, (Uint8)button_nr);
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if (event.type == SDL_EVENT_PEN_BUTTON_DOWN) { if (event.type == SDL_EVENT_PEN_BUTTON_DOWN) {
SDLTest_AssertCheck(event.pbutton.which == ptest.ids[pen_nr], SDLTest_AssertCheck(event.pbutton.which == ptest.ids[pen_nr],
@ -1143,7 +1143,7 @@ pen_buttonReporting(void *arg)
SDL_bool found_event = SDL_FALSE; SDL_bool found_event = SDL_FALSE;
pen_state &= ~(1 << (button_nr - 1)); pen_state &= ~(1 << (button_nr - 1));
SDL_SendPenButton(0, ptest.ids[pen_nr], SDL_RELEASED, button_nr); SDL_SendPenButton(0, ptest.ids[pen_nr], SDL_RELEASED, (Uint8)button_nr);
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if (event.type == SDL_EVENT_PEN_BUTTON_UP) { if (event.type == SDL_EVENT_PEN_BUTTON_UP) {
SDLTest_AssertCheck(event.pbutton.which == ptest.ids[pen_nr], SDLTest_AssertCheck(event.pbutton.which == ptest.ids[pen_nr],
@ -1345,7 +1345,7 @@ pen_movementAndAxes(void *arg)
while ((last_action = _pen_simulate(steps, &sim_pc, &simulated_pens[0], 2))) { while ((last_action = _pen_simulate(steps, &sim_pc, &simulated_pens[0], 2))) {
int attempts = 0; int attempts = 0;
SDL_Pen *simpen = &simulated_pens[last_action->pen_index]; SDL_Pen *simpen = &simulated_pens[last_action->pen_index];
SDL_PenID reported_which = -1; SDL_PenID reported_which = 0;
float reported_x = -1.0f, reported_y = -1.0f; float reported_x = -1.0f, reported_y = -1.0f;
float *reported_axes = NULL; float *reported_axes = NULL;
Uint32 reported_pen_state = 0; Uint32 reported_pen_state = 0;
@ -1728,7 +1728,7 @@ pen_mouseEmulation(void *arg)
_penmouse_expect_button(SDL_PRESSED, 1); _penmouse_expect_button(SDL_PRESSED, 1);
for (i = 1; i <= 3; ++i) { for (i = 1; i <= 3; ++i) {
SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, (Uint8)i);
_penmouse_expect_button(SDL_PRESSED, i + 1); _penmouse_expect_button(SDL_PRESSED, i + 1);
} }
SDLTest_AssertPass("Button press mouse emulation"); SDLTest_AssertPass("Button press mouse emulation");
@ -1738,7 +1738,7 @@ pen_mouseEmulation(void *arg)
_penmouse_expect_button(SDL_RELEASED, 1); _penmouse_expect_button(SDL_RELEASED, 1);
for (i = 1; i <= 3; ++i) { for (i = 1; i <= 3; ++i) {
SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, (Uint8)i);
_penmouse_expect_button(SDL_RELEASED, i + 1); _penmouse_expect_button(SDL_RELEASED, i + 1);
} }
SDLTest_AssertPass("Button release mouse emulation"); SDLTest_AssertPass("Button release mouse emulation");
@ -1800,10 +1800,10 @@ pen_mouseEmulationDelayed(void *arg)
/* Test button press reporting */ /* Test button press reporting */
for (i = 1; i <= 2; ++i) { for (i = 1; i <= 2; ++i) {
SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button press suppressed: %d", _mouseemu_last_event); "Non-touching button press suppressed: %d", _mouseemu_last_event);
SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button release suppressed: %d", _mouseemu_last_event); "Non-touching button release suppressed: %d", _mouseemu_last_event);
} }
@ -1816,7 +1816,7 @@ pen_mouseEmulationDelayed(void *arg)
/* Test button press reporting, releasing extra button AFTER lifting pen */ /* Test button press reporting, releasing extra button AFTER lifting pen */
for (i = 1; i <= 2; ++i) { for (i = 1; i <= 2; ++i) {
SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button press suppressed (A.1): %d", _mouseemu_last_event); "Non-touching button press suppressed (A.1): %d", _mouseemu_last_event);
SDL_SendPenTipEvent(0, ptest.ids[0], SDL_PRESSED); SDL_SendPenTipEvent(0, ptest.ids[0], SDL_PRESSED);
@ -1825,7 +1825,7 @@ pen_mouseEmulationDelayed(void *arg)
SDL_SendPenTipEvent(0, ptest.ids[0], SDL_RELEASED); SDL_SendPenTipEvent(0, ptest.ids[0], SDL_RELEASED);
_penmouse_expect_button(SDL_RELEASED, i + 1); _penmouse_expect_button(SDL_RELEASED, i + 1);
SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button press suppressed (A.2): %d", _mouseemu_last_event); "Non-touching button press suppressed (A.2): %d", _mouseemu_last_event);
} }
@ -1833,13 +1833,13 @@ pen_mouseEmulationDelayed(void *arg)
/* Test button press reporting, releasing extra button BEFORE lifting pen */ /* Test button press reporting, releasing extra button BEFORE lifting pen */
for (i = 1; i <= 2; ++i) { for (i = 1; i <= 2; ++i) {
SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_PRESSED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button press suppressed (B.1): %d", _mouseemu_last_event); "Non-touching button press suppressed (B.1): %d", _mouseemu_last_event);
SDL_SendPenTipEvent(0, ptest.ids[0], SDL_PRESSED); SDL_SendPenTipEvent(0, ptest.ids[0], SDL_PRESSED);
_penmouse_expect_button(SDL_PRESSED, i + 1); _penmouse_expect_button(SDL_PRESSED, i + 1);
SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, i); SDL_SendPenButton(0, ptest.ids[0], SDL_RELEASED, (Uint8)i);
SDLTest_AssertCheck(0 == _mouseemu_last_event, SDLTest_AssertCheck(0 == _mouseemu_last_event,
"Non-touching button press suppressed (B.2): %d", _mouseemu_last_event); "Non-touching button press suppressed (B.2): %d", _mouseemu_last_event);
SDL_SendPenTipEvent(0, ptest.ids[0], SDL_RELEASED); SDL_SendPenTipEvent(0, ptest.ids[0], SDL_RELEASED);

16
test/testautomation_render.c
View file

@ -150,7 +150,7 @@ static int render_testPrimitives(void *arg)
checkFailCount2 = 0; checkFailCount2 = 0;
for (y = 0; y < 3; y++) { for (y = 0; y < 3; y++) {
for (x = y % 2; x < TESTRENDER_SCREEN_W; x += 2) { for (x = y % 2; x < TESTRENDER_SCREEN_W; x += 2) {
ret = SDL_SetRenderDrawColor(renderer, x * y, x * y / 2, x * y / 3, SDL_ALPHA_OPAQUE); ret = SDL_SetRenderDrawColor(renderer, (Uint8)(x * y), (Uint8)(x * y / 2), (Uint8)(x * y / 3), SDL_ALPHA_OPAQUE);
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -247,7 +247,7 @@ static int render_testPrimitivesBlend(void *arg)
checkFailCount2 = 0; checkFailCount2 = 0;
checkFailCount3 = 0; checkFailCount3 = 0;
for (i = 0; i < TESTRENDER_SCREEN_W; i += 2) { for (i = 0; i < TESTRENDER_SCREEN_W; i += 2) {
ret = SDL_SetRenderDrawColor(renderer, 60 + 2 * i, 240 - 2 * i, 50, 3 * i); ret = SDL_SetRenderDrawColor(renderer, (Uint8)(60 + 2 * i), (Uint8)(240 - 2 * i), 50, (Uint8)(3 * i));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -271,7 +271,7 @@ static int render_testPrimitivesBlend(void *arg)
checkFailCount2 = 0; checkFailCount2 = 0;
checkFailCount3 = 0; checkFailCount3 = 0;
for (i = 0; i < TESTRENDER_SCREEN_H; i += 2) { for (i = 0; i < TESTRENDER_SCREEN_H; i += 2) {
ret = SDL_SetRenderDrawColor(renderer, 60 + 2 * i, 240 - 2 * i, 50, 3 * i); ret = SDL_SetRenderDrawColor(renderer, (Uint8)(60 + 2 * i), (Uint8)(240 - 2 * i), 50, (Uint8)(3 * i));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -297,7 +297,7 @@ static int render_testPrimitivesBlend(void *arg)
checkFailCount3 = 0; checkFailCount3 = 0;
for (j = 0; j < TESTRENDER_SCREEN_H; j += 3) { for (j = 0; j < TESTRENDER_SCREEN_H; j += 3) {
for (i = 0; i < TESTRENDER_SCREEN_W; i += 3) { for (i = 0; i < TESTRENDER_SCREEN_W; i += 3) {
ret = SDL_SetRenderDrawColor(renderer, j * 4, i * 3, j * 4, i * 3); ret = SDL_SetRenderDrawColor(renderer, (Uint8)(j * 4), (Uint8)(i * 3), (Uint8)(j * 4), (Uint8)(i * 3));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -485,7 +485,7 @@ static int render_testBlitColor(void *arg)
for (j = 0; j <= nj; j += 4) { for (j = 0; j <= nj; j += 4) {
for (i = 0; i <= ni; i += 4) { for (i = 0; i <= ni; i += 4) {
/* Set color mod. */ /* Set color mod. */
ret = SDL_SetTextureColorMod(tface, (255 / nj) * j, (255 / ni) * i, (255 / nj) * j); ret = SDL_SetTextureColorMod(tface, (Uint8)((255 / nj) * j), (Uint8)((255 / ni) * i), (Uint8)((255 / nj) * j));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -562,7 +562,7 @@ static int render_testBlitAlpha(void *arg)
for (j = 0; j <= nj; j += 4) { for (j = 0; j <= nj; j += 4) {
for (i = 0; i <= ni; i += 4) { for (i = 0; i <= ni; i += 4) {
/* Set alpha mod. */ /* Set alpha mod. */
ret = SDL_SetTextureAlphaMod(tface, (255 / ni) * i); ret = SDL_SetTextureAlphaMod(tface, (Uint8)((255 / ni) * i));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
@ -745,13 +745,13 @@ static int render_testBlitBlend(void *arg)
for (i = 0; i <= ni; i += 4) { for (i = 0; i <= ni; i += 4) {
/* Set color mod. */ /* Set color mod. */
ret = SDL_SetTextureColorMod(tface, (255 / nj) * j, (255 / ni) * i, (255 / nj) * j); ret = SDL_SetTextureColorMod(tface, (Uint8)((255 / nj) * j), (Uint8)((255 / ni) * i), (Uint8)((255 / nj) * j));
if (ret != 0) { if (ret != 0) {
checkFailCount1++; checkFailCount1++;
} }
/* Set alpha mod. */ /* Set alpha mod. */
ret = SDL_SetTextureAlphaMod(tface, (100 / ni) * i); ret = SDL_SetTextureAlphaMod(tface, (Uint8)((100 / ni) * i));
if (ret != 0) { if (ret != 0) {
checkFailCount2++; checkFailCount2++;
} }

4
test/testautomation_surface.c
View file

@ -155,13 +155,13 @@ static void testBlitBlendMode(int mode)
for (i = 0; i <= ni; i += 4) { for (i = 0; i <= ni; i += 4) {
if (mode == -2) { if (mode == -2) {
/* Set color mod. */ /* Set color mod. */
ret = SDL_SetSurfaceColorMod(face, (255 / nj) * j, (255 / ni) * i, (255 / nj) * j); ret = SDL_SetSurfaceColorMod(face, (Uint8)((255 / nj) * j), (Uint8)((255 / ni) * i), (Uint8)((255 / nj) * j));
if (ret != 0) { if (ret != 0) {
checkFailCount2++; checkFailCount2++;
} }
} else if (mode == -3) { } else if (mode == -3) {
/* Set alpha mod. */ /* Set alpha mod. */
ret = SDL_SetSurfaceAlphaMod(face, (255 / ni) * i); ret = SDL_SetSurfaceAlphaMod(face, (Uint8)((255 / ni) * i));
if (ret != 0) { if (ret != 0) {
checkFailCount3++; checkFailCount3++;
} }

2
test/testpen.c
View file

@ -152,7 +152,7 @@ static void DrawScreen(SDL_Renderer *renderer)
(color & 0x01) ? 0xff : 0, (color & 0x01) ? 0xff : 0,
(color & 0x02) ? 0xff : 0, (color & 0x02) ? 0xff : 0,
(color & 0x04) ? 0xff : 0, (color & 0x04) ? 0xff : 0,
(int)(0xff * last_pressure)); (Uint8)(0xff * last_pressure));
/* Cone base width based on pressure: */ /* Cone base width based on pressure: */
SDL_RenderLine(renderer, X, Y, endx + (ydelta * last_pressure / 3.0f), endy - (xdelta * last_pressure / 3.0f)); SDL_RenderLine(renderer, X, Y, endx + (ydelta * last_pressure / 3.0f), endy - (xdelta * last_pressure / 3.0f));
SDL_RenderLine(renderer, X, Y, endx - (ydelta * last_pressure / 3.0f), endy + (xdelta * last_pressure / 3.0f)); SDL_RenderLine(renderer, X, Y, endx - (ydelta * last_pressure / 3.0f), endy + (xdelta * last_pressure / 3.0f));