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

Fallback to nanosvg when rsgv fails.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2019-10-22 00:17:00 +02:00
parent be761daf7c
commit 6e1b801de2
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tuxpaint.c
View file

@ -18105,7 +18105,7 @@ static SDL_Surface *load_svg(const char *file)
* FIXME * FIXME
*/ */
/* New libcairo2, rsvg and rsvg-cairo based code */ /* New libcairo2, rsvg and rsvg-cairo based code */
static SDL_Surface *load_svg(const char *file) static SDL_Surface *_load_svg(const char *file)
{ {
cairo_surface_t *cairo_surf; cairo_surface_t *cairo_surf;
cairo_t *cr; cairo_t *cr;
@ -18272,6 +18272,17 @@ static SDL_Surface *load_svg(const char *file)
return (sdl_surface); return (sdl_surface);
} }
/* Wraper to fallback to SDL2_Image's nanosvg in case rsvg fails for some reason
like in Android builds trying to access starters provided as assets. */
static SDL_Surface *load_svg(const char *file)
{
SDL_Surface *sdl_surface;
sdl_surface = _load_svg(file);
if (sdl_surface == NULL)
sdl_surface = IMG_Load(file);
return(sdl_surface);
}
#endif #endif