mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix svg resize

Browse Source
This commit is contained in:
TangoCash
2021-11-02 17:36:19 +01:00
committed by Thilo Graf
parent a8c4560f30
commit 87aa258771
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -46,7 +46,7 @@ extern int fh_crw_id (const char *);
#ifdef FBV_SUPPORT_SVG #ifdef FBV_SUPPORT_SVG
extern int fh_svg_getsize (const char *, int *, int *, int, int); extern int fh_svg_getsize (const char *, int *, int *, int, int);
extern int fh_svg_load (const char *, unsigned char **, int *, int *); extern int fh_svg_load (const char *, unsigned char **, int *, int *);
extern int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int* dx, int* dy); extern int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int dx, int dy);
extern int fh_svg_id (const char *); extern int fh_svg_id (const char *);
#endif #endif
double CPictureViewer::m_aspect_ratio_correction; double CPictureViewer::m_aspect_ratio_correction;
@@ -865,7 +865,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width,
#ifdef FBV_SUPPORT_SVG #ifdef FBV_SUPPORT_SVG
if (name.find(".svg") == (name.length() - 4)) if (name.find(".svg") == (name.length() - 4))
{ {
svg_load_resize(name.c_str(), &buffer, &x, &y, width, height); svg_load_resize(name.c_str(), &buffer, &x, &y, *width, *height);
if (x != *width || y != *height) if (x != *width || y != *height)
buffer = ResizeA(buffer, x, y, *width, *height); buffer = ResizeA(buffer, x, y, *width, *height);
} }

8
src/driver/pictureviewer/svg.cpp
View File

@@ -108,9 +108,9 @@ error:
return 0; return 0;
} }
int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int* dx, int* dy); int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int dx, int dy);
int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int* dx, int* dy) int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy, int dx, int dy)
{ {
NSVGimage *image = NULL; NSVGimage *image = NULL;
NSVGrasterizer *rast = NULL; NSVGrasterizer *rast = NULL;
@@ -134,8 +134,8 @@ int svg_load_resize(const char *name, unsigned char **buffer, int* ox, int* oy,
} }
float scale_w,scale_h; float scale_w,scale_h;
scale_w = *dx/w; scale_w = (float)dx/(float)w;
scale_h = *dy/h; scale_h = (float)dy/(float)h;
w = (int)(w*scale_w); w = (int)(w*scale_w);
h = (int)(h*scale_h); h = (int)(h*scale_h);