Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved memory management in wxSVGFileDC.

Browse Source
This commit is contained in:
Maarten Bent
2016-03-16 00:02:31 +01:00
parent c7e4b301d0
commit 1717db0373
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/dcsvg.h
View File

@@ -229,14 +229,14 @@ private:
// their current values in wxDC. // their current values in wxDC.
void DoStartNewGraphics(); void DoStartNewGraphics();
wxFileOutputStream *m_outfile;
wxString m_filename; wxString m_filename;
int m_sub_images; // number of png format images we have int m_sub_images; // number of png format images we have
bool m_OK; bool m_OK;
bool m_graphics_changed; // set by Set{Brush,Pen}() bool m_graphics_changed; // set by Set{Brush,Pen}()
int m_width, m_height; int m_width, m_height;
double m_dpi; double m_dpi;
wxSVGBitmapHandler* m_bmp_handler; // class to handle bitmaps wxScopedPtr<wxFileOutputStream> m_outfile;
wxScopedPtr<wxSVGBitmapHandler> m_bmp_handler; // class to handle bitmaps
// The clipping nesting level is incremented by every call to // The clipping nesting level is incremented by every call to
// SetClippingRegion() and reset when DestroyClippingRegion() is called. // SetClippingRegion() and reset when DestroyClippingRegion() is called.

10
src/common/dcsvg.cpp
View File

@@ -409,8 +409,8 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height,
////////////////////code here ////////////////////code here
m_bmp_handler = NULL; m_bmp_handler.reset();
m_outfile = new wxFileOutputStream(filename); m_outfile.reset(new wxFileOutputStream(filename));
m_OK = m_outfile->IsOk(); m_OK = m_outfile->IsOk();
if (m_OK) if (m_OK)
{ {
@@ -438,7 +438,6 @@ wxSVGFileDCImpl::~wxSVGFileDCImpl()
s += wxS("</g>\n</svg>\n"); s += wxS("</g>\n</svg>\n");
write(s); write(s);
delete m_outfile;
} }
void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const
@@ -956,8 +955,7 @@ void wxSVGFileDCImpl::SetBackgroundMode( int mode )
void wxSVGFileDCImpl::SetBitmapHandler(wxSVGBitmapHandler* handler) void wxSVGFileDCImpl::SetBitmapHandler(wxSVGBitmapHandler* handler)
{ {
delete m_bmp_handler; m_bmp_handler.reset(handler);
m_bmp_handler = handler;
} }
void wxSVGFileDCImpl::SetBrush(const wxBrush& brush) void wxSVGFileDCImpl::SetBrush(const wxBrush& brush)
@@ -1080,7 +1078,7 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor
// If we don't have any bitmap handler yet, use the default one. // If we don't have any bitmap handler yet, use the default one.
if ( !m_bmp_handler ) if ( !m_bmp_handler )
m_bmp_handler = new wxSVGBitmapFileHandler(); m_bmp_handler.reset(new wxSVGBitmapFileHandler());
m_bmp_handler->ProcessBitmap(bmp, x, y, *m_outfile); m_bmp_handler->ProcessBitmap(bmp, x, y, *m_outfile);
} }