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

Recovering fonts after recovering progressbar.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2015-05-11 20:12:03 +02:00
parent 58d202d275
commit 9adbd1e261
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dirwalk.c
View file

@ -263,6 +263,8 @@ int compare_ftw_str(const void *v1, const void *v2)
void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, char *restrict const dir, unsigned dirlen,
int rsrc, void (*fn) (SDL_Surface * screen,
SDL_Texture * texture,
SDL_Renderer * renderer,
const char *restrict const dir,
unsigned dirlen, tp_ftw_str * files,
unsigned count, const char *restrict const locale),
@ -390,7 +392,7 @@ void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer
}
free(file_names);
#else
fn(screen, dir, dirlen, file_names, num_file_names, locale);
fn(screen, texture, renderer, dir, dirlen, file_names, num_file_names, locale);
#endif
}

2
src/dirwalk.h
View file

@ -50,6 +50,8 @@ void loadfont_callback(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
int compare_ftw_str(const void *v1, const void *v2);
void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, char *restrict const dir, unsigned dirlen,
int rsrc, void (*fn) (SDL_Surface * screen,
SDL_Texture * texture,
SDL_Renderer * renderer,
const char *restrict const dir,
unsigned dirlen, tp_ftw_str * files,
unsigned count, const char *restrict const locale),

4
src/tuxpaint.c
View file

@ -6517,6 +6517,8 @@ static unsigned compute_default_scale_factor(double ratio)
/* directory walking... */
static void loadbrush_callback(SDL_Surface * screen,
SDL_Texture * texture,
SDL_Renderer * renderer,
const char *restrict const dir,
unsigned dirlen, tp_ftw_str * files,
unsigned i, const char *restrict const locale)
@ -7408,6 +7410,8 @@ static void get_stamp_thumb(stamp_type * sd)
static void loadstamp_callback(SDL_Surface * screen,
SDL_Texture * texture,
SDL_Renderer * renderer,
const char *restrict const dir,
unsigned dirlen, tp_ftw_str * files,
unsigned i, const char *restrict const locale)