file I forgot to commit last time (wxCritSection)

[wxWidgets.git] / src / msw / dib.cpp

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index d214648061187118587c07bbd89207e34b56d397..ac6bffe7dd3da8ad46cbe77bdae59da05fd5d2f9 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -40,7 +40,9 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef __MWERKS__
 #include <memory.h>
+#endif
 
 #include "wx/msw/dib.h"
 
@@ -473,7 +475,8 @@ BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
            goto ErrExit;
     }
 
-    if (!(nNumColors = (WORD)lpbi->biClrUsed))
+    nNumColors = (WORD)lpbi->biClrUsed;
+    if ( nNumColors == 0 )
     {
        /* no color table for 24-bit, default size otherwise */
        if (lpbi->biBitCount != 24)
@@ -594,7 +597,8 @@ BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
     lpInfo = (LPBITMAPINFOHEADER) GlobalLock(hDIB);
 #endif
 
-    if ((hPalette = MakeDIBPalette(lpInfo)))
+    hPalette = MakeDIBPalette(lpInfo);
+    if ( hPalette )
     {
        // Need to realize palette for converting DIB to bitmap.
        hOldPal = SelectPalette(hDC, hPalette, TRUE);