diff options
author | Borja Lorente | 2016-08-26 12:26:29 +0200 |
---|---|---|
committer | Borja Lorente | 2016-08-26 12:27:16 +0200 |
commit | ec6bb1431eb3e54f4a1dddd051cb9b8dfa14f43d (patch) | |
tree | 9f4faf82ac4ad7ccf8a16335c82077d5909b1642 /graphics/macgui/macwindow.cpp | |
parent | 5bba0897246de34318ac6049402b9d5f58722aa4 (diff) | |
download | scummvm-rg350-ec6bb1431eb3e54f4a1dddd051cb9b8dfa14f43d.tar.gz scummvm-rg350-ec6bb1431eb3e54f4a1dddd051cb9b8dfa14f43d.tar.bz2 scummvm-rg350-ec6bb1431eb3e54f4a1dddd051cb9b8dfa14f43d.zip |
GRAPHICS: Fix leak in ninepatch destructor
Diffstat (limited to 'graphics/macgui/macwindow.cpp')
-rw-r--r-- | graphics/macgui/macwindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp index abb91f180d..975d52639e 100644 --- a/graphics/macgui/macwindow.cpp +++ b/graphics/macgui/macwindow.cpp @@ -317,14 +317,14 @@ void MacWindow::setScroll(float scrollPos, float scrollSize) { void MacWindow::loadBorder(Common::SeekableReadStream &file, bool active, int lo, int ro, int to, int bo) { Image::BitmapDecoder bmpDecoder; - Graphics::Surface source; + Graphics::Surface *source; Graphics::TransparentSurface *surface = new Graphics::TransparentSurface(); bmpDecoder.loadStream(file); - source = *(bmpDecoder.getSurface()); + source = bmpDecoder.getSurface()->convertTo(surface->getSupportedPixelFormat(), bmpDecoder.getPalette()); - source.convertToInPlace(surface->getSupportedPixelFormat(), bmpDecoder.getPalette()); - surface->copyFrom(source); + surface->create(source->w, source->h, surface->getSupportedPixelFormat()); + surface->copyFrom(*source); surface->applyColorKey(255, 0, 255, false); if (active) @@ -336,6 +336,8 @@ void MacWindow::loadBorder(Common::SeekableReadStream &file, bool active, int lo _macBorder.setOffsets(lo, ro, to, bo); updateInnerDims(); + source->free(); + delete source; } void MacWindow::setCloseable(bool closeable) { |