diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-11-03 18:05:10 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2020-11-03 18:05:18 +0100 |
| commit | 0d594319c1f423679c7e7cd712003921da103c70 (patch) | |
| tree | ecdc31a39baa10de21cef5c0fcb95b5e1a1a9142 /src | |
| parent | 5132bb6a062b68be8f0e9e84fb5ae979ab613ea5 (diff) | |
Add extra argument to Fl_SVG_File_Surface constructor.
This makes processing of the underlying FILE object consistant by classes
Fl_SVG_File_Surface, Fl_EPS_File_Surface and Fl_PostScript_File_Surface.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/SVG/Fl_SVG_File_Surface.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/drivers/SVG/Fl_SVG_File_Surface.cxx b/src/drivers/SVG/Fl_SVG_File_Surface.cxx index ae0172fc4..2a48ac8f6 100644 --- a/src/drivers/SVG/Fl_SVG_File_Surface.cxx +++ b/src/drivers/SVG/Fl_SVG_File_Surface.cxx @@ -305,7 +305,8 @@ int Fl_SVG_Graphics_Driver::descent() { return Fl_Display_Device::display_device()->driver()->descent(); } -Fl_SVG_File_Surface::Fl_SVG_File_Surface(int w, int h, FILE *f) : Fl_Widget_Surface(new Fl_SVG_Graphics_Driver(f)) { +Fl_SVG_File_Surface::Fl_SVG_File_Surface(int w, int h, FILE *f, int (*closef)(FILE*)) : Fl_Widget_Surface(new Fl_SVG_Graphics_Driver(f)) { + closef_ = closef; Fl_Window *win = Fl::first_window(); float s = (win ? Fl::screen_scale(win->screen_num()) : 1); int sw = w * s, sh = h * s; @@ -321,12 +322,7 @@ Fl_SVG_File_Surface::Fl_SVG_File_Surface(int w, int h, FILE *f) : Fl_Widget_Surf } Fl_SVG_File_Surface::~Fl_SVG_File_Surface() { - Fl_SVG_Graphics_Driver *driver = (Fl_SVG_Graphics_Driver*)this->driver(); - if (driver) { - fputs("</g></g></svg>\n", driver->file()); - fflush(driver->file()); - delete driver; - } + if (driver()) close(); } FILE *Fl_SVG_File_Surface::file() { @@ -337,7 +333,7 @@ FILE *Fl_SVG_File_Surface::file() { int Fl_SVG_File_Surface::close() { Fl_SVG_Graphics_Driver *driver = (Fl_SVG_Graphics_Driver*)this->driver(); fputs("</g></g></svg>\n", driver->file()); - int retval = fclose(driver->file()); + int retval = (closef_ ? closef_(driver->file()) : fclose(driver->file())); delete driver; this->driver(NULL); return retval; |