Kaydet (Commit) 6c99bca3 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in InverseColorMap

Change-Id: I04801a912397ca0081201f52b756c37f83538be5
Reviewed-on: https://gerrit.libreoffice.org/59776
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst ab6da907
...@@ -93,8 +93,8 @@ class VCL_PLUGIN_PUBLIC InverseColorMap ...@@ -93,8 +93,8 @@ class VCL_PLUGIN_PUBLIC InverseColorMap
{ {
private: private:
sal_uInt8* pBuffer; std::unique_ptr<sal_uInt8[]> pBuffer;
sal_uInt8* pMap; std::unique_ptr<sal_uInt8[]> pMap;
const sal_uLong nBits; const sal_uLong nBits;
SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax ); SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax );
......
...@@ -262,8 +262,8 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : ...@@ -262,8 +262,8 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
const long cginc = ( xsqr - ( cGreen << nBits ) ) << 1; const long cginc = ( xsqr - ( cGreen << nBits ) ) << 1;
const long cbinc = ( xsqr - ( cBlue << nBits ) ) << 1; const long cbinc = ( xsqr - ( cBlue << nBits ) ) << 1;
sal_uLong* cdp = reinterpret_cast<sal_uLong*>(pBuffer); sal_uLong* cdp = reinterpret_cast<sal_uLong*>(pBuffer.get());
sal_uInt8* crgbp = pMap; sal_uInt8* crgbp = pMap.get();
for( r = 0, rxx = crinc; r < nColorMax; rdist += rxx, r++, rxx += xsqr2 ) for( r = 0, rxx = crinc; r < nColorMax; rdist += rxx, r++, rxx += xsqr2 )
{ {
...@@ -282,8 +282,6 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) : ...@@ -282,8 +282,6 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
InverseColorMap::~InverseColorMap() InverseColorMap::~InverseColorMap()
{ {
std::free( pBuffer );
std::free( pMap );
} }
void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax )
...@@ -291,11 +289,11 @@ void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax ) ...@@ -291,11 +289,11 @@ void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax )
const sal_uLong nCount = nMax * nMax * nMax; const sal_uLong nCount = nMax * nMax * nMax;
const sal_uLong nSize = nCount * sizeof( sal_uLong ); const sal_uLong nSize = nCount * sizeof( sal_uLong );
pMap = static_cast<sal_uInt8*>(std::malloc( nCount )); pMap.reset(new sal_uInt8[ nCount ]);
memset( pMap, 0x00, nCount ); memset( pMap.get(), 0x00, nCount );
pBuffer = static_cast<sal_uInt8*>(std::malloc( nSize )); pBuffer.reset(new sal_uInt8[ nSize ]);
memset( pBuffer, 0xff, nSize ); memset( pBuffer.get(), 0xff, nSize );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment