mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for issue #155 - continued

Browse Source 
Restores proper separation of what is in libfltk and what is in libfltk_images
This commit is contained in:
ManoloFLTK 2020-11-12 14:50:45 +01:00
parent 231159e16c
commit a4bacf83c4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Image.H
View File

@ -302,7 +302,7 @@ private:
fl_uintptr_t id_; fl_uintptr_t id_;
fl_uintptr_t mask_; fl_uintptr_t mask_;
int cache_w_, cache_h_; // size of image when cached int cache_w_, cache_h_; // size of image when cached
virtual void cache_size(int &width, int &height) {}
public: public:
Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0); Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0);

2
FL/Fl_SVG_Image.H
View File

@ -147,7 +147,7 @@ private:
float average_weight_; float average_weight_;
float svg_scaling_(int W, int H); float svg_scaling_(int W, int H);
void rasterize_(int W, int H); void rasterize_(int W, int H);
void cache_size(int &width, int &height); virtual void cache_size(int &width, int &height);
void init_(const char *filename, const char *filedata, Fl_SVG_Image *copy_source); void init_(const char *filename, const char *filedata, Fl_SVG_Image *copy_source);
Fl_SVG_Image(Fl_SVG_Image *source); Fl_SVG_Image(Fl_SVG_Image *source);
public: public:

7
src/Fl_Graphics_Driver.cxx
View File

@ -29,7 +29,6 @@
#include <FL/Fl_Image_Surface.H> #include <FL/Fl_Image_Surface.H>
#include <FL/math.h> #include <FL/math.h>
#include <FL/platform.H> #include <FL/platform.H>
#include <FL/Fl_SVG_Image.H>
FL_EXPORT Fl_Graphics_Driver *fl_graphics_driver; // the current driver of graphics operations FL_EXPORT Fl_Graphics_Driver *fl_graphics_driver; // the current driver of graphics operations
@ -211,9 +210,9 @@ void Fl_Graphics_Driver::cache_size(Fl_Image *img, int &width, int &height)
width = (width+1) * scale(); width = (width+1) * scale();
height = (height+1) * scale(); height = (height+1) * scale();
} }
if (img->d() == 4 && ((Fl_RGB_Image*)img)->as_svg_image()) { // check for SVG image if (img->d() == 4) { // check for depth-4 RGB image
Fl_SVG_Image *svg = (Fl_SVG_Image*)img; Fl_RGB_Image *rgb = (Fl_RGB_Image*)img;
svg->cache_size(width, height); rgb->cache_size(width, height);
} }
} }