diff options
| -rw-r--r-- | FL/Fl_SVG_Image.H | 2 | ||||
| -rw-r--r-- | src/Fl_SVG_Image.cxx | 4 | ||||
| -rw-r--r-- | src/fl_images_core.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl_SVG_Image.H b/FL/Fl_SVG_Image.H index a8258b20a..a4d873aa7 100644 --- a/FL/Fl_SVG_Image.H +++ b/FL/Fl_SVG_Image.H @@ -74,7 +74,7 @@ public: virtual void color_average(Fl_Color c, float i); virtual void draw(int X, int Y, int W, int H, int cx = 0, int cy = 0); void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); } - static void* gzopen(const char *fname); + static void* fl_gzopen(const char *fname); }; #endif // FL_SVG_IMAGE_H diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx index c1548ec16..313693fbd 100644 --- a/src/Fl_SVG_Image.cxx +++ b/src/Fl_SVG_Image.cxx @@ -77,7 +77,7 @@ float Fl_SVG_Image::svg_scaling_(int W, int H) { } /** Opens for reading a potentially gzip'ed file identified by a UTF-8 encoded filename. */ -void* Fl_SVG_Image::gzopen(const char *fname) { +void* Fl_SVG_Image::fl_gzopen(const char *fname) { #if defined(HAVE_LIBZ) # ifdef _WIN32 unsigned wl = fl_utf8towc(fname, strlen(fname), NULL, 0) + 1; @@ -102,7 +102,7 @@ static char *svg_inflate(const char *fname) { struct stat b; fl_stat(fname, &b); long size = b.st_size; - gzFile gzf = (gzFile)Fl_SVG_Image::gzopen(fname); + gzFile gzf = (gzFile)Fl_SVG_Image::fl_gzopen(fname); if (!gzf) return NULL; int l; bool direct = gzdirect(gzf); diff --git a/src/fl_images_core.cxx b/src/fl_images_core.cxx index 3ed225c8c..b44fd6b23 100644 --- a/src/fl_images_core.cxx +++ b/src/fl_images_core.cxx @@ -94,7 +94,7 @@ fl_check_images(const char *name, // I - Filename #ifdef FLTK_USE_NANOSVG # if defined(HAVE_LIBZ) if (header[0] == 0x1f && header[1] == 0x8b) { // denotes gzip'ed data - gzFile gzf = (gzFile)Fl_SVG_Image::gzopen(name); + gzFile gzf = (gzFile)Fl_SVG_Image::fl_gzopen(name); if (gzf) { gzread(gzf, header, headerlen); gzclose(gzf); |