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

add parentheses for && inside || to fix g++ 4.3 warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@55257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-25 14:39:48 +00:00
parent f837582af4
commit 3053ecbd72
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/bitmap.cpp
View File

@@ -966,9 +966,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
GdkPixbuf *pixbuf = GetPixbuf(); GdkPixbuf *pixbuf = GetPixbuf();
const bool hasAlpha = HasAlpha(); const bool hasAlpha = HasAlpha();
// allow access if bpp is valid and matches existence of alpha // allow access if bpp is valid and matches existence of alpha
if (pixbuf != NULL && ( if ( pixbuf && ((bpp == 24 && !hasAlpha) || (bpp == 32 && hasAlpha)) )
bpp == 24 && !hasAlpha ||
bpp == 32 && hasAlpha))
{ {
data.m_height = gdk_pixbuf_get_height( pixbuf ); data.m_height = gdk_pixbuf_get_height( pixbuf );
data.m_width = gdk_pixbuf_get_width( pixbuf ); data.m_width = gdk_pixbuf_get_width( pixbuf );