notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up more "unused variable" warnings

Browse source
This commit is contained in:
Bill Kendrick 2023-02-12 13:25:59 -08:00
parent 4d932f800b
commit 7e99b05510
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
magic/src/perspective.c
View file

@ -671,10 +671,6 @@ void perspective_release(magic_api * api, int which,
canvas->format->Gmask, canvas->format->Gmask,
canvas->format->Bmask, 0); canvas->format->Bmask, 0);
printf("SDL_BlitSurface(canvas_back (%d), update_rect (%d), aux_surf (%d), NULL\n",
canvas_back, update_rect, aux_surf);
fflush(stdout);
SDL_BlitSurface(canvas_back, update_rect, aux_surf, NULL); SDL_BlitSurface(canvas_back, update_rect, aux_surf, NULL);
scaled_surf = api->scale(aux_surf, canvas->w, canvas->h, 0); scaled_surf = api->scale(aux_surf, canvas->w, canvas->h, 0);
SDL_BlitSurface(scaled_surf, NULL, canvas, NULL); SDL_BlitSurface(scaled_surf, NULL, canvas, NULL);

18
src/tuxpaint.c
View file

@ -2274,7 +2274,9 @@ static char *uppercase(const char *restrict const str);
static wchar_t *uppercase_w(const wchar_t *restrict const str); static wchar_t *uppercase_w(const wchar_t *restrict const str);
static char *textdir(const char *const str); static char *textdir(const char *const str);
static SDL_Surface *do_render_button_label(const char *const label); static SDL_Surface *do_render_button_label(const char *const label);
#if 0
static SDL_Surface * crop_surface(SDL_Surface * surf); static SDL_Surface * crop_surface(SDL_Surface * surf);
#endif
static void create_button_labels(void); static void create_button_labels(void);
static Uint32 scrolltimer_selector_callback(Uint32 interval, void *param); static Uint32 scrolltimer_selector_callback(Uint32 interval, void *param);
static Uint32 scrolltimer_tool_callback(Uint32 interval, void *param); static Uint32 scrolltimer_tool_callback(Uint32 interval, void *param);
@ -9860,15 +9862,16 @@ static SDL_Surface *do_render_button_label(const char *const label)
tmp_surf1 = render_text(myfont, upstr, black); tmp_surf1 = render_text(myfont, upstr, black);
free(upstr); free(upstr);
// FIXME: CROP LABELS
tmp_surf = tmp_surf1; tmp_surf = tmp_surf1;
/*
// FIXME: CROP LABELS
#if 0
tmp_surf = crop_surface(tmp_surf1); tmp_surf = crop_surface(tmp_surf1);
if(tmp_surf == NULL) if(tmp_surf == NULL)
return NULL; return NULL;
SDL_FreeSurface(tmp_surf1); SDL_FreeSurface(tmp_surf1);
*/ #endif
DEBUG_PRINTF("Rendered as: %d x %d\n", tmp_surf->w, tmp_surf->h); DEBUG_PRINTF("Rendered as: %d x %d\n", tmp_surf->w, tmp_surf->h);
@ -9888,6 +9891,7 @@ static SDL_Surface *do_render_button_label(const char *const label)
return surf; return surf;
} }
#if 0
static SDL_Surface * crop_surface(SDL_Surface * surf) { static SDL_Surface * crop_surface(SDL_Surface * surf) {
int top, bottom, left, right, x, y, w, h; int top, bottom, left, right, x, y, w, h;
Uint8 r, g, b, a, r1, g1, b1, a1; Uint8 r, g, b, a, r1, g1, b1, a1;
@ -9949,6 +9953,7 @@ static SDL_Surface * crop_surface(SDL_Surface * surf) {
return new_surf; return new_surf;
} }
#endif
/** /**
* FIXME * FIXME
@ -20679,6 +20684,7 @@ static void do_render_cur_text(int do_blit)
unicodeIn[i] = (FriBidiChar) texttool_str[i]; unicodeIn[i] = (FriBidiChar) texttool_str[i];
int maxlevel = fribidi_log2vis(unicodeIn, texttool_len, &baseDir, unicodeOut, 0, 0, 0); int maxlevel = fribidi_log2vis(unicodeIn, texttool_len, &baseDir, unicodeOut, 0, 0, 0);
maxlevel = maxlevel; // FIXME: Avoiding "unused variable" warning. Note: if we remove it, baseDir isn't used either! -bjk 2023.02.12
/* FIXME: If we determine that some new text was RtoL, we should /* FIXME: If we determine that some new text was RtoL, we should
reposition the text */ reposition the text */
@ -30418,13 +30424,12 @@ static void setup(void)
if (!fullscreen) if (!fullscreen)
{ {
int win_x = SDL_WINDOWPOS_UNDEFINED, win_y = SDL_WINDOWPOS_UNDEFINED; int win_x = SDL_WINDOWPOS_UNDEFINED, win_y = SDL_WINDOWPOS_UNDEFINED;
int found_capable_display, max_scrn_w, max_scrn_h; int max_scrn_w, max_scrn_h;
int num_displays, num_modes, i, res; int num_displays, i, res;
SDL_DisplayMode mode; SDL_DisplayMode mode;
/* Query all displays to ensure that, if we only have on display, /* Query all displays to ensure that, if we only have on display,
that Tux Paint's window will not be larger than it */ that Tux Paint's window will not be larger than it */
found_capable_display = 0;
max_scrn_w = -1; max_scrn_w = -1;
max_scrn_h = -1; max_scrn_h = -1;
@ -30441,7 +30446,6 @@ static void setup(void)
} else { } else {
if (mode.w >= WINDOW_WIDTH && mode.h >= WINDOW_HEIGHT) { if (mode.w >= WINDOW_WIDTH && mode.h >= WINDOW_HEIGHT) {
/* Found a display capable of the chosen window size */ /* Found a display capable of the chosen window size */
found_capable_display = 1;
} else { } else {
if (mode.w >= max_scrn_w) if (mode.w >= max_scrn_w)
max_scrn_w = mode.w; max_scrn_w = mode.w;