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

no real changes, just attempt to work around false coverity report 130

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-30 15:46:32 +00:00
parent cbaa866f0a
commit 16fc7c4524
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/x11/bitmap.cpp
View File

@@ -593,10 +593,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth ); M_BMPDATA->m_pixmap = XCreatePixmap( xdisplay, xroot, width, height, depth );
// Create mask // Create mask if necessary
const bool hasMask = image.HasMask();
XImage *mask_image = (XImage*) NULL; XImage *mask_image = (XImage*) NULL;
if (image.HasMask()) if ( hasMask )
{ {
mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 ); mask_image = XCreateImage( xdisplay, xvisual, 1, ZPixmap, 0, 0, width, height, 32, 0 );
mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height ); mask_image->data = (char*) malloc( mask_image->bytes_per_line * mask_image->height );
@@ -646,8 +647,6 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
unsigned char *colorCube = unsigned char *colorCube =
wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube; wxTheApp->GetVisualInfo(M_BMPDATA->m_display)->m_colorCube;
bool hasMask = image.HasMask();
int index = 0; int index = 0;
for (int y = 0; y < height; y++) for (int y = 0; y < height; y++)
{ {