[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/rempt/impex-refactoring] libs/image/tiles3/swap: Use QScopedArrayPointer to make sure array g
From:       Frederik Gladhorn <gladhorn () kde ! org>
Date:       2016-11-05 14:52:03
Message-ID: E1c32KB-0001CD-4x () code ! kde ! org
[Download RAW message or body]

Git commit 4d1abba271cdf373e5004aa50915267aea52f363 by Frederik Gladhorn.
Committed on 05/11/2016 at 14:46.
Pushed by gladhorn into branch 'rempt/impex-refactoring'.

Use QScopedArrayPointer to make sure array gets deleted

M  +3    -5    libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp

http://commits.kde.org/krita/4d1abba271cdf373e5004aa50915267aea52f363

diff --git a/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp \
b/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp index 2fae3a3..5370fc3 100644
--- a/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp
+++ b/libs/image/tiles3/swap/kis_legacy_tile_compressor.cpp
@@ -35,22 +35,20 @@ bool KisLegacyTileCompressor::writeTile(KisTileSP tile, \
KisPaintDeviceWriter &st  const qint32 tileDataSize = \
TILE_DATA_SIZE(tile->pixelSize());  
     const qint32 bufferSize = maxHeaderLength() + 1;
-    quint8 *headerBuffer = new quint8[bufferSize];
+    QScopedArrayPointer<quint8> headerBuffer(new quint8[bufferSize]);
 
-    bool retval = writeHeader(tile, headerBuffer);
+    bool retval = writeHeader(tile, headerBuffer.data());
     Q_ASSERT(retval);  // currently the code returns true unconditionally
     if (!retval) {
         return false;
     }
 
-    store.write((char *)headerBuffer, strlen((char *)headerBuffer));
+    store.write((char *)headerBuffer.data(), strlen((char *)headerBuffer.data()));
 
     tile->lockForRead();
     retval = store.write((char *)tile->data(), tileDataSize);
     tile->unlock();
 
-    delete[] headerBuffer;
-
     return retval;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]