Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-22 06:22:58 +02:00
Code Issues Releases Wiki Activity

Remove naked malloc (or similar) and free in: various

Browse Source
This commit is contained in:
Paul Licameli
2017-02-25 18:13:05 -05:00
parent cab99f7234
commit 1126925438
11 changed files with 44 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Theme.cpp
View File

@@ -347,7 +347,9 @@ wxImage ThemeBase::MaskedImage( char const ** pXpm, char const ** pMask )
// unsigned char *src = Img1.GetData();
unsigned char *mk = Img2.GetData();
unsigned char *alpha = (unsigned char*)malloc( nBytes );
//wxImage::setAlpha requires memory allocated with malloc, not new
MallocString<unsigned char> alpha{
static_cast<unsigned char*>(malloc( nBytes )) };
// Extract alpha channel from second XPM.
for(i=0;i<nBytes;i++)
@@ -356,7 +358,7 @@ wxImage ThemeBase::MaskedImage( char const ** pXpm, char const ** pMask )
mk+=3;
}
Img1.SetAlpha( alpha);
Img1.SetAlpha( alpha.release() );
//dmazzoni: the top line does not work on wxGTK
//wxBitmap Result( Img1, 32 );