don't crash if one of GetAllCommands() parameters is NULL (coverity checker CID 11)

[wxWidgets.git] / src / common / imagbmp.cpp

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 247a300e6deb91e9aa31add878811fde09f61aaa..5f9e5b072a0fda15765cf50c3c881f274b0ead32 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagbmp.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -76,7 +72,7 @@ bool wxBMPHandler::SaveFile(wxImage *image,
                             wxOutputStream& stream,
                             bool verbose)
 {
                             wxOutputStream& stream,
                             bool verbose)
 {

-    return SaveDib(image, stream, verbose, TRUE/*IsBmp*/, FALSE/*IsMask*/);
+    return SaveDib(image, stream, verbose, true/*IsBmp*/, false/*IsMask*/);

 }
 
 bool wxBMPHandler::SaveDib(wxImage *image,
 }
 
 bool wxBMPHandler::SaveDib(wxImage *image,


@@ -86,13 +82,13 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                            bool IsMask)
 
 {
                            bool IsMask)
 
 {

-    wxCHECK_MSG( image, FALSE, _T("invalid pointer in wxBMPHandler::SaveFile") );
+    wxCHECK_MSG( image, false, _T("invalid pointer in wxBMPHandler::SaveFile") );

 
     if ( !image->Ok() )
     {
         if ( verbose )
             wxLogError(_("BMP: Couldn't save invalid image."));
 
     if ( !image->Ok() )
     {
         if ( verbose )
             wxLogError(_("BMP: Couldn't save invalid image."));

-        return FALSE;
+        return false;

     }
 
     // get the format of the BMP file to save, else use 24bpp
     }
 
     // get the format of the BMP file to save, else use 24bpp


@@ -126,7 +122,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         {
             if ( verbose )
                 wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
         {
             if ( verbose )
                 wxLogError(_("BMP: wxImage doesn't have own wxPalette."));

-            return FALSE;
+            return false;

         }
         bpp = 8;
         palette_size = 256;
         }
         bpp = 8;
         palette_size = 256;


@@ -201,7 +197,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't write the file (Bitmap) header."));

-            return FALSE;
+            return false;

         }
     }
     if ( !IsMask )
         }
     }
     if ( !IsMask )


@@ -222,7 +218,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't write the file (BitmapInfo) header."));

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 


@@ -273,16 +269,16 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) ||
               (format == wxBMP_1BPP_BW) )
     {
     else if ( (format == wxBMP_8BPP_GREY) || (format == wxBMP_8BPP_RED) ||
               (format == wxBMP_1BPP_BW) )
     {

-        int i;

         rgbquad = new wxUint8 [palette_size*4];
 
         rgbquad = new wxUint8 [palette_size*4];
 

-        for (i = 0; i < palette_size; i++)
+        for ( int i = 0; i < palette_size; i++ )

         {
         {

-            // if 1BPP_BW then just 0 and 255 then exit
-            if (( i > 0) && (format == wxBMP_1BPP_BW)) i = 255;
-            rgbquad[i*4] = i;
-            rgbquad[i*4+1] = i;
-            rgbquad[i*4+2] = i;
+            // if 1BPP_BW then the value should be either 0 or 255
+            wxUint8 c = (wxUint8)((i > 0) && (format == wxBMP_1BPP_BW) ? 255 : i);
+
+            rgbquad[i*4] =
+            rgbquad[i*4+1] =
+            rgbquad[i*4+2] = c;

             rgbquad[i*4+3] = 0;
         }
     }
             rgbquad[i*4+3] = 0;
         }
     }


@@ -301,7 +297,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                 delete palette;
 #endif // wxUSE_PALETTE
                 delete q_image;
                 delete palette;
 #endif // wxUSE_PALETTE
                 delete q_image;

-                return FALSE;
+                return false;

             }
             }
         delete []rgbquad;
             }
             }
         delete []rgbquad;


@@ -336,9 +332,9 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             {
                 pixel = 3*(y*width + x);
 #if wxUSE_PALETTE
             {
                 pixel = 3*(y*width + x);
 #if wxUSE_PALETTE

-                buffer[x] = palette->GetPixel( data[pixel],
-                                               data[pixel+1],
-                                               data[pixel+2] );
+                buffer[x] = (wxUint8)palette->GetPixel( data[pixel],
+                                                        data[pixel+1],
+                                                        data[pixel+2] );

 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x] = 0;
 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x] = 0;


@@ -370,7 +366,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
                 // fill buffer, ignore if > width
 #if wxUSE_PALETTE
 
                 // fill buffer, ignore if > width
 #if wxUSE_PALETTE

-                buffer[x/2] =
+                buffer[x/2] = (wxUint8)(

                     ((wxUint8)palette->GetPixel(data[pixel],
                                                 data[pixel+1],
                                                 data[pixel+2]) << 4) |
                     ((wxUint8)palette->GetPixel(data[pixel],
                                                 data[pixel+1],
                                                 data[pixel+2]) << 4) |


@@ -378,7 +374,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                      ? 0
                      : ((wxUint8)palette->GetPixel(data[pixel+3],
                                                    data[pixel+4],
                      ? 0
                      : ((wxUint8)palette->GetPixel(data[pixel+3],
                                                    data[pixel+4],

-                                                   data[pixel+5]) ));
+                                                   data[pixel+5]) ))    );

 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x/2] = 0;
 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x/2] = 0;


@@ -392,14 +388,15 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                 pixel = 3*(y*width + x);
 
 #if wxUSE_PALETTE
                 pixel = 3*(y*width + x);
 
 #if wxUSE_PALETTE

-                buffer[x/8] = ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) |
+                buffer[x/8] = (wxUint8)(
+                                           ((wxUint8)palette->GetPixel(data[pixel], data[pixel+1], data[pixel+2]) << 7) |

                     (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) |
                     (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) |
                     (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) |
                     (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) |
                     (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) |
                     (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) |
                     (((x+1) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+3], data[pixel+4], data[pixel+5]) << 6)) |
                     (((x+2) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+6], data[pixel+7], data[pixel+8]) << 5)) |
                     (((x+3) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+9], data[pixel+10], data[pixel+11]) << 4)) |
                     (((x+4) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+12], data[pixel+13], data[pixel+14]) << 3)) |
                     (((x+5) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+15], data[pixel+16], data[pixel+17]) << 2)) |
                     (((x+6) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+18], data[pixel+19], data[pixel+20]) << 1)) |

-                    (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23])     ));
+                    (((x+7) > width) ? 0 : ((wxUint8)palette->GetPixel(data[pixel+21], data[pixel+22], data[pixel+23])     ))    );

 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x/8] = 0;
 #else
                 // FIXME: what should this be? use some std palette maybe?
                 buffer[x/8] = 0;


@@ -412,7 +409,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             {
                 pixel = 3*(y*width + x);
 
             {
                 pixel = 3*(y*width + x);
 

-                buffer[x/8] =
+                buffer[x/8] = (wxUint8)(

                                           (((wxUint8)(data[pixel]   /128.)) << 7) |
                    (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) |
                    (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) |
                                           (((wxUint8)(data[pixel]   /128.)) << 7) |
                    (((x+1) > width) ? 0 : (((wxUint8)(data[pixel+3] /128.)) << 6)) |
                    (((x+2) > width) ? 0 : (((wxUint8)(data[pixel+6] /128.)) << 5)) |


@@ -420,7 +417,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
                    (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) |
                    (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) |
                    (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) |
                    (((x+4) > width) ? 0 : (((wxUint8)(data[pixel+12]/128.)) << 3)) |
                    (((x+5) > width) ? 0 : (((wxUint8)(data[pixel+15]/128.)) << 2)) |
                    (((x+6) > width) ? 0 : (((wxUint8)(data[pixel+18]/128.)) << 1)) |

-                   (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.))     ));
+                   (((x+7) > width) ? 0 : (((wxUint8)(data[pixel+21]/128.))     ))    );

             }
         }
 
             }
         }
 


@@ -433,7 +430,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             delete palette;
 #endif // wxUSE_PALETTE
             delete q_image;
             delete palette;
 #endif // wxUSE_PALETTE
             delete q_image;

-            return FALSE;
+            return false;

         }
     }
     delete[] buffer;
         }
     }
     delete[] buffer;


@@ -442,7 +439,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 #endif // wxUSE_PALETTE
     delete q_image;
 
 #endif // wxUSE_PALETTE
     delete q_image;
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -453,7 +450,7 @@ typedef struct
 
 bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                              int bpp, int ncolors, int comp,
 
 bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                              int bpp, int ncolors, int comp,

-                             off_t bmpOffset, wxInputStream& stream,
+                             wxFileOffset bmpOffset, wxInputStream& stream,

                              bool verbose, bool IsBmp, bool hasPalette)
 {
     wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0;
                              bool verbose, bool IsBmp, bool hasPalette)
 {
     wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0;


@@ -474,7 +471,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't allocate memory."));
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't allocate memory."));

-            return FALSE;
+            return false;

         }
     }
     else
         }
     }
     else


@@ -492,7 +489,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             wxLogError( _("BMP: Couldn't allocate memory.") );
         if ( cmap )
             delete[] cmap;
             wxLogError( _("BMP: Couldn't allocate memory.") );
         if ( cmap )
             delete[] cmap;

-        return FALSE;
+        return false;

     }
 
     // Reading the palette, if it exists:
     }
 
     // Reading the palette, if it exists:


@@ -517,9 +514,9 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             else
             {
                 //used in reading .ico file mask
             else
             {
                 //used in reading .ico file mask

-                r[j] = cmap[j].r = j * 255;
-                g[j] = cmap[j].g = j * 255;
-                b[j] = cmap[j].b = j * 255;
+                r[j] = cmap[j].r =
+                g[j] = cmap[j].g =
+                b[j] = cmap[j].b = ( j ? 255 : 0 );

             }
         }
 
             }
         }
 


@@ -669,8 +666,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                                     {
                                         ++readBytes ;
                                         aByte = stream.GetC();
                                     {
                                         ++readBytes ;
                                         aByte = stream.GetC();

-                                        nibble[0] = ( (aByte & 0xF0) >> 4 ) ;
-                                        nibble[1] = ( aByte & 0x0F ) ;
+                                        nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
+                                        nibble[1] = (wxUint8)( aByte & 0x0F ) ;

                                     }
                                     ptr[poffset    ] = cmap[nibble[k%2]].r;
                                     ptr[poffset + 1] = cmap[nibble[k%2]].g;
                                     }
                                     ptr[poffset    ] = cmap[nibble[k%2]].r;
                                     ptr[poffset + 1] = cmap[nibble[k%2]].g;


@@ -686,8 +683,8 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                         else
                         {
                             wxUint8 nibble[2] ;
                         else
                         {
                             wxUint8 nibble[2] ;

-                            nibble[0] = ( (aByte & 0xF0) >> 4 ) ;
-                            nibble[1] = ( aByte & 0x0F ) ;
+                            nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
+                            nibble[1] = (wxUint8)( aByte & 0x0F ) ;

 
                             for ( int l = 0; l < first && column < width; l++ )
                             {
 
                             for ( int l = 0; l < first && column < width; l++ )
                             {


@@ -797,11 +794,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                    to retrieve the color data out of the word.  Then
                    shift it left by (8 - number of bits) such that
                    the image has the proper dynamic range */
                    to retrieve the color data out of the word.  Then
                    shift it left by (8 - number of bits) such that
                    the image has the proper dynamic range */

-                temp = (aWord & rmask) >> rshift << (8-rbits);
+                temp = (unsigned char)((aWord & rmask) >> rshift << (8-rbits));

                 ptr[poffset] = temp;
                 ptr[poffset] = temp;

-                temp = (aWord & gmask) >> gshift << (8-gbits);
+                temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits));

                 ptr[poffset + 1] = temp;
                 ptr[poffset + 1] = temp;

-                temp = (aWord & bmask) >> bshift << (8-bbits);
+                temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits));

                 ptr[poffset + 2] = temp;
                 column++;
             }
                 ptr[poffset + 2] = temp;
                 column++;
             }


@@ -811,11 +808,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                 stream.Read(&aDword, 4);
                 aDword = wxINT32_SWAP_ON_BE(aDword);
                 linepos += 4;
                 stream.Read(&aDword, 4);
                 aDword = wxINT32_SWAP_ON_BE(aDword);
                 linepos += 4;

-                temp = (aDword & rmask) >> rshift;
+                temp = (unsigned char)((aDword & rmask) >> rshift);

                 ptr[poffset] = temp;
                 ptr[poffset] = temp;

-                temp = (aDword & gmask) >> gshift;
+                temp = (unsigned char)((aDword & gmask) >> gshift);

                 ptr[poffset + 1] = temp;
                 ptr[poffset + 1] = temp;

-                temp = (aDword & bmask) >> bshift;
+                temp = (unsigned char)((aDword & bmask) >> bshift);

                 ptr[poffset + 2] = temp;
                 column++;
             }
                 ptr[poffset + 2] = temp;
                 column++;
             }


@@ -831,7 +828,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
 
     delete[] cmap;
 
 
     delete[] cmap;
 

-    image->SetMask(FALSE);
+    image->SetMask(false);

 
     const wxStreamError err = stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
 
     const wxStreamError err = stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;


@@ -843,15 +840,15 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     wxUint16        aWord;
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
     wxUint16        aWord;
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];

-    off_t           offset;

 
 

-    offset = 0; // keep gcc quiet
+    wxFileOffset offset = 0; // keep gcc quiet

     if ( IsBmp )
     {
         // read the header off the .BMP format file
 
         offset = stream.TellI();
     if ( IsBmp )
     {
         // read the header off the .BMP format file
 
         offset = stream.TellI();

-        if (offset == wxInvalidOffset) offset = 0;
+        if (offset == wxInvalidOffset)
+            offset = 0;

 
         stream.Read(bbuf, 2);
         stream.Read(dbuf, 16);
 
         stream.Read(bbuf, 2);
         stream.Read(dbuf, 16);


@@ -866,21 +863,21 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]);
 
     stream.Read(dbuf, 4 * 2);
     offset = offset + wxINT32_SWAP_ON_BE(dbuf[2]);
 
     stream.Read(dbuf, 4 * 2);

-    int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
-    int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]);
+    int width = wxINT32_SWAP_ON_BE((int)dbuf[0]);
+    int height = wxINT32_SWAP_ON_BE((int)dbuf[1]);

     if ( !IsBmp)height = height  / 2; // for icons divide by 2
 
     if ( width > 32767 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
     if ( !IsBmp)height = height  / 2; // for icons divide by 2
 
     if ( width > 32767 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );

-        return FALSE;
+        return false;

     }
     if ( height > 32767 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );
     }
     if ( height > 32767 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Image height > 32767 pixels for file.") );

-        return FALSE;
+        return false;

     }
 
     stream.Read(&aWord, 2);
     }
 
     stream.Read(&aWord, 2);


@@ -889,26 +886,26 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
             int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
         */
     stream.Read(&aWord, 2);
             int planes = (int)wxUINT16_SWAP_ON_BE( aWord );
         */
     stream.Read(&aWord, 2);

-    int bpp = (int)wxUINT16_SWAP_ON_BE(aWord);
+    int bpp = wxUINT16_SWAP_ON_BE((int)aWord);

     if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Unknown bitdepth in file.") );
     if ( bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Unknown bitdepth in file.") );

-        return FALSE;
+        return false;

     }
 
     stream.Read(dbuf, 4 * 4);
     }
 
     stream.Read(dbuf, 4 * 4);

-    int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
+    int comp = wxINT32_SWAP_ON_BE((int)dbuf[0]);

     if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
          comp != BI_BITFIELDS )
     {
         if (verbose)
             wxLogError( _("DIB Header: Unknown encoding in file.") );
     if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&
          comp != BI_BITFIELDS )
     {
         if (verbose)
             wxLogError( _("DIB Header: Unknown encoding in file.") );

-        return FALSE;
+        return false;

     }
 
     stream.Read(dbuf, 4 * 2);
     }
 
     stream.Read(dbuf, 4 * 2);

-    int ncolors = (int)wxINT32_SWAP_ON_BE( dbuf[0] );
+    int ncolors = wxINT32_SWAP_ON_BE( (int)dbuf[0] );

     if (ncolors == 0)
         ncolors = 1 << bpp;
     /* some more sanity checks */
     if (ncolors == 0)
         ncolors = 1 << bpp;
     /* some more sanity checks */


@@ -918,16 +915,16 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     {
         if (verbose)
             wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );
     {
         if (verbose)
             wxLogError( _("DIB Header: Encoding doesn't match bitdepth.") );

-        return FALSE;
+        return false;

     }
 
     //read DIB; this is the BMP image or the XOR part of an icon image
     if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream,
     }
 
     //read DIB; this is the BMP image or the XOR part of an icon image
     if ( !DoLoadDib(image, width, height, bpp, ncolors, comp, offset, stream,

-                    verbose, IsBmp, TRUE) )
+                    verbose, IsBmp, true) )

     {
         if (verbose)
             wxLogError( _("Error in reading image DIB .") );
     {
         if (verbose)
             wxLogError( _("Error in reading image DIB .") );

-        return FALSE;
+        return false;

     }
 
     if ( !IsBmp )
     }
 
     if ( !IsBmp )


@@ -936,24 +933,24 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
         //there is no palette, so we will create one
         wxImage mask;
         if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream,
         //there is no palette, so we will create one
         wxImage mask;
         if ( !DoLoadDib(&mask, width, height, 1, 2, BI_RGB, offset, stream,

-                        verbose, IsBmp, FALSE) )
+                        verbose, IsBmp, false) )

         {
             if (verbose)
                 wxLogError( _("ICO: Error in reading mask DIB.") );
         {
             if (verbose)
                 wxLogError( _("ICO: Error in reading mask DIB.") );

-            return FALSE;
+            return false;

         }
         image->SetMaskFromImage(mask, 255, 255, 255);
 
     }
 
         }
         image->SetMaskFromImage(mask, 255, 255, 255);
 
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int WXUNUSED(index))
 {
     // Read a single DIB fom the file:
 }
 
 bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,
                             bool verbose, int WXUNUSED(index))
 {
     // Read a single DIB fom the file:

-    return LoadDib(image, stream, verbose, TRUE/*isBmp*/);
+    return LoadDib(image, stream, verbose, true/*isBmp*/);

 }
 
 bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 }
 
 bool wxBMPHandler::DoCanRead(wxInputStream& stream)


@@ -961,7 +958,7 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
     unsigned char hdr[2];
 
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
     unsigned char hdr[2];
 
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )

-        return FALSE;
+        return false;

 
     // do we have the BMP file signature?
     return hdr[0] == 'B' && hdr[1] == 'M';
 
     // do we have the BMP file signature?
     return hdr[0] == 'B' && hdr[1] == 'M';


@@ -1008,22 +1005,21 @@ bool wxICOHandler::SaveFile(wxImage *image,
                             bool verbose)
 
 {
                             bool verbose)
 
 {

-    bool bResult = FALSE;

     //sanity check; icon must be less than 127 pixels high and 255 wide
     if ( image->GetHeight () > 127 )
     {
         if ( verbose )
             wxLogError(_("ICO: Image too tall for an icon."));
     //sanity check; icon must be less than 127 pixels high and 255 wide
     if ( image->GetHeight () > 127 )
     {
         if ( verbose )
             wxLogError(_("ICO: Image too tall for an icon."));

-        return FALSE;
+        return false;

     }
     if ( image->GetWidth () > 255 )
     {
         if ( verbose )
             wxLogError(_("ICO: Image too wide for an icon."));
     }
     if ( image->GetWidth () > 255 )
     {
         if ( verbose )
             wxLogError(_("ICO: Image too wide for an icon."));

-        return FALSE;
+        return false;

     }
 
     }
 

-    int images = 1; // only generate one image
+    const int images = 1; // only generate one image

 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for
 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for


@@ -1037,8 +1033,8 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
     ICONDIR IconDir;
     IconDir.idReserved = 0;
 
     ICONDIR IconDir;
     IconDir.idReserved = 0;

-    IconDir.idType = wxUINT16_SWAP_ON_BE(type);
-    IconDir.idCount = wxUINT16_SWAP_ON_BE(images);
+    IconDir.idType = wxUINT16_SWAP_ON_BE((wxUint16)type);
+    IconDir.idCount = wxUINT16_SWAP_ON_BE((wxUint16)images);

     stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
     stream.Write(&IconDir.idType, sizeof(IconDir.idType));
     stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));
     stream.Write(&IconDir.idReserved, sizeof(IconDir.idReserved));
     stream.Write(&IconDir.idType, sizeof(IconDir.idType));
     stream.Write(&IconDir.idCount, sizeof(IconDir.idCount));


@@ -1046,12 +1042,12 @@ bool wxICOHandler::SaveFile(wxImage *image,
     {
         if ( verbose )
             wxLogError(_("ICO: Error writing the image file!"));
     {
         if ( verbose )
             wxLogError(_("ICO: Error writing the image file!"));

-        return FALSE;
+        return false;

     }
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;
     }
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;

-    for (int i = 0; i < images; i++)
+    for (int img = 0; img < images; img++)

     {
         wxImage mask;
 
     {
         wxImage mask;
 


@@ -1095,44 +1091,44 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
         // monochome bitmap:
         mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
 
         // monochome bitmap:
         mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);

-        bool IsBmp = FALSE;
-        bool IsMask = FALSE;
+        bool IsBmp = false;
+        bool IsMask = false;

 
         //calculate size and offset of image and mask
         wxCountingOutputStream cStream;
 
         //calculate size and offset of image and mask
         wxCountingOutputStream cStream;

-        bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask);
+        bool bResult = SaveDib(image, cStream, verbose, IsBmp, IsMask);

         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
         }

-        IsMask = TRUE;
+        IsMask = true;

 
         bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
 
         bResult = SaveDib(&mask, cStream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
         wxUint32 Size = cStream.GetSize();
 
         }
         wxUint32 Size = cStream.GetSize();
 

-        // wxCountingOutputStream::Ok() always returns TRUE for now and this
+        // wxCountingOutputStream::Ok() always returns true for now and this

         // "if" provokes VC++ warnings in optimized build
 #if 0
         if ( !cStream.Ok() )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
         // "if" provokes VC++ warnings in optimized build
 #if 0
         if ( !cStream.Ok() )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
 #endif // 0
 
         offset = offset + sizeof(ICONDIRENTRY);
 
         }
 #endif // 0
 
         offset = offset + sizeof(ICONDIRENTRY);
 

-        icondirentry.bWidth = image->GetWidth();
-        icondirentry.bHeight = 2 * image->GetHeight();
+        icondirentry.bWidth = (wxUint8)image->GetWidth();
+        icondirentry.bHeight = (wxUint8)(2 * image->GetHeight());

         icondirentry.bColorCount = 0;
         icondirentry.bReserved = 0;
         icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);
         icondirentry.bColorCount = 0;
         icondirentry.bReserved = 0;
         icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);


@@ -1169,31 +1165,31 @@ bool wxICOHandler::SaveFile(wxImage *image,
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
 
         // actually save it:
         }
 
         // actually save it:

-        IsMask = FALSE;
+        IsMask = false;

         bResult = SaveDib(image, stream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
         bResult = SaveDib(image, stream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
         }

-        IsMask = TRUE;
+        IsMask = true;

 
         bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));
 
         bResult = SaveDib(&mask, stream, verbose, IsBmp, IsMask);
         if ( !bResult )
         {
             if ( verbose )
                 wxLogError(_("ICO: Error writing the image file!"));

-            return FALSE;
+            return false;

         }
 
     } // end of for loop
 
         }
 
     } // end of for loop
 

-    return TRUE;
+    return true;

 }
 
 bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
 }
 
 bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,


@@ -1206,12 +1202,12 @@ bool wxICOHandler::LoadFile(wxImage *image, wxInputStream& stream,
 bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
                             bool WXUNUSED(verbose), int index)
 {
 bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
                             bool WXUNUSED(verbose), int index)
 {

-    bool bResult = FALSE;
-    bool IsBmp = FALSE;
+    bool bResult wxDUMMY_INITIALIZE(false);
+    bool IsBmp = false;

 
     ICONDIR IconDir;
 
 
     ICONDIR IconDir;
 

-    off_t iPos = stream.TellI();
+    wxFileOffset iPos = stream.TellI();

     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     // nType is 1 for Icons, 2 for Cursors:
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     // nType is 1 for Icons, 2 for Cursors:


@@ -1253,14 +1249,14 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
     if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
     {
         wxLogError(_("ICO: Invalid icon index."));
     if ( iSel == wxNOT_FOUND || iSel < 0 || iSel >= nIcons )
     {
         wxLogError(_("ICO: Invalid icon index."));

-        bResult = FALSE;
+        bResult = false;

     }
     else
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;
         stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);
     }
     else
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;
         stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);

-        bResult = LoadDib(image, stream, TRUE, IsBmp);
+        bResult = LoadDib(image, stream, true, IsBmp);

         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         {
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         {


@@ -1276,7 +1272,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
 int wxICOHandler::GetImageCount(wxInputStream& stream)
 {
     ICONDIR IconDir;
 int wxICOHandler::GetImageCount(wxInputStream& stream)
 {
     ICONDIR IconDir;

-    off_t iPos = stream.TellI();
+    wxFileOffset iPos = stream.TellI();

     stream.SeekI(0);
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     stream.SeekI(0);
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);


@@ -1289,7 +1285,7 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream)
     stream.SeekI(0);
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
     stream.SeekI(0);
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )

-        return FALSE;
+        return false;

 
     // hdr[2] is one for an icon and two for a cursor
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';
 
     // hdr[2] is one for an icon and two for a cursor
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\1' && hdr[3] == '\0';


@@ -1311,7 +1307,7 @@ bool wxCURHandler::DoCanRead(wxInputStream& stream)
     stream.SeekI(0);
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
     stream.SeekI(0);
     unsigned char hdr[4];
     if ( !stream.Read(hdr, WXSIZEOF(hdr)) )

-        return FALSE;
+        return false;

 
     // hdr[2] is one for an icon and two for a cursor
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';
 
     // hdr[2] is one for an icon and two for a cursor
     return hdr[0] == '\0' && hdr[1] == '\0' && hdr[2] == '\2' && hdr[3] == '\0';


@@ -1344,7 +1340,7 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
     if ( FCC1 != riff32 )
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
     if ( FCC1 != riff32 )

-        return FALSE;
+        return false;

 
     // we have a riff file:
     while (stream.IsOk())
 
     // we have a riff file:
     while (stream.IsOk())


@@ -1376,35 +1372,35 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }
         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }

-    return FALSE;
+    return false;

 }
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {
     wxInt32 FCC1, FCC2;
     wxUint32 datalen ;
 }
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {
     wxInt32 FCC1, FCC2;
     wxUint32 datalen ;

-    
+

     wxInt32 riff32;
     memcpy( &riff32, "RIFF", 4 );
     wxInt32 list32;
     memcpy( &list32, "LIST", 4 );
     wxInt32 ico32;
     wxInt32 riff32;
     memcpy( &riff32, "RIFF", 4 );
     wxInt32 list32;
     memcpy( &list32, "LIST", 4 );
     wxInt32 ico32;

-    memcpy( &ico32, "icon", 4 ); 
+    memcpy( &ico32, "icon", 4 );

     wxInt32 anih32;
     memcpy( &anih32, "anih", 4 );
     wxInt32 anih32;
     memcpy( &anih32, "anih", 4 );

-    
+

     stream.SeekI(0);
     if ( !stream.Read(&FCC1, 4) )
     stream.SeekI(0);
     if ( !stream.Read(&FCC1, 4) )

-        return FALSE;
+        return false;

 
     if ( FCC1 != riff32 )
 
     if ( FCC1 != riff32 )

-        return FALSE;
+        return false;

 
     // we have a riff file:
     while ( stream.IsOk() )
     {
         if ( FCC1 == anih32 )
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
         if ( FCC1 == anih32 )

-            return TRUE;
+            return true;

         // we always have a data size:
         stream.Read(&datalen, 4);
         datalen = wxINT32_SWAP_ON_BE(datalen) ;
         // we always have a data size:
         stream.Read(&datalen, 4);
         datalen = wxINT32_SWAP_ON_BE(datalen) ;


@@ -1424,11 +1420,11 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
         if ( !stream.Read(&FCC1, 4) )
         {
             // reading failed -- either EOF or IO error, bail out anyhow
         if ( !stream.Read(&FCC1, 4) )
         {
             // reading failed -- either EOF or IO error, bail out anyhow

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 int wxANIHandler::GetImageCount(wxInputStream& stream)
 }
 
 int wxANIHandler::GetImageCount(wxInputStream& stream)


@@ -1444,7 +1440,7 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     memcpy( &ico32, "icon", 4 );
     wxInt32 anih32;
     memcpy( &anih32, "anih", 4 );
     memcpy( &ico32, "icon", 4 );
     wxInt32 anih32;
     memcpy( &anih32, "anih", 4 );

-    
+

     stream.SeekI(0);
     stream.Read(&FCC1, 4);
     if ( FCC1 != riff32 )
     stream.SeekI(0);
     stream.Read(&FCC1, 4);
     if ( FCC1 != riff32 )