another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 7bbac0ed60c716e879815f79d8ce3e00735c9101..6f3a298d18eed65e66b51db3336e4f7512b5565f 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagbmp.cpp
+// Name:        src/common/imagbmp.cpp

 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$


@@ -7,54 +7,55 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "imagbmp.h"
-#endif
-

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_IMAGE && wxUSE_STREAMS
+#if wxUSE_IMAGE

 
 #include "wx/imagbmp.h"
 
 #include "wx/imagbmp.h"

-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"
+    #include "wx/math.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

-#include "wx/intl.h"
-#include "wx/module.h"

 #include "wx/quantize.h"
 #include "wx/quantize.h"

+#include "wx/scopeguard.h"
+#include "wx/anidecod.h"

 
 // For memcpy
 #include <string.h>
 
 
 // For memcpy
 #include <string.h>
 

-#ifdef __SALFORDC__
-#ifdef FAR
-#undef FAR
-#endif
-#endif
-
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-

 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 

+#if wxUSE_STREAMS
+

 #ifndef BI_RGB
 #ifndef BI_RGB

-#define BI_RGB       0
+    #define BI_RGB       0
+#endif
+
+#ifndef BI_RLE8

 #define BI_RLE8      1
 #define BI_RLE8      1

+#endif
+
+#ifndef BI_RLE4

 #define BI_RLE4      2
 #endif
 
 #define BI_RLE4      2
 #endif
 


@@ -67,8 +68,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 bool wxBMPHandler::SaveFile(wxImage *image,
                             wxOutputStream& stream,
                             bool verbose)
 bool wxBMPHandler::SaveFile(wxImage *image,
                             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,


@@ -78,21 +79,21 @@ 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 ( !image->Ok() )
     {

-        if ( verbose ) 
+        if ( verbose )

             wxLogError(_("BMP: Couldn't save invalid image."));
             wxLogError(_("BMP: Couldn't save invalid image."));

-        return FALSE;
+        return false;

     }
 
     // get the format of the BMP file to save, else use 24bpp
     unsigned format = wxBMP_24BPP;
     }
 
     // get the format of the BMP file to save, else use 24bpp
     unsigned format = wxBMP_24BPP;

-    if ( image->HasOption(wxBMP_FORMAT) )
-        format = image->GetOptionInt(wxBMP_FORMAT);
+    if ( image->HasOption(wxIMAGE_OPTION_BMP_FORMAT) )
+        format = image->GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT);

 
 

-    unsigned bpp;     // # of bits per pixel
+    wxUint16 bpp;     // # of bits per pixel

     int palette_size; // # of color map entries, ie. 2^bpp colors
 
     // set the bpp and appropriate palette_size, and do additional checks
     int palette_size; // # of color map entries, ie. 2^bpp colors
 
     // set the bpp and appropriate palette_size, and do additional checks


@@ -117,8 +118,8 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             )
         {
             if ( verbose )
             )
         {
             if ( verbose )

-                wxLogError(_("BMP: wImage doesn't have own wxPalette."));
-            return FALSE;
+                wxLogError(_("BMP: wxImage doesn't have own wxPalette."));
+            return false;

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


@@ -149,7 +150,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
         wxUint16  bpp;            // bits per pixel
         wxUint32  compression;    // compression method
         wxUint32  size_of_bmp;    // size of the bitmap
         wxUint16  bpp;            // bits per pixel
         wxUint32  compression;    // compression method
         wxUint32  size_of_bmp;    // size of the bitmap

-        wxUint32  h_res, v_res;   // image resolution in dpi
+        wxUint32  h_res, v_res;   // image resolution in pixels-per-meter

         wxUint32  num_clrs;       // number of colors used
         wxUint32  num_signif_clrs;// number of significant colors
     } hdr;
         wxUint32  num_clrs;       // number of colors used
         wxUint32  num_signif_clrs;// number of significant colors
     } hdr;


@@ -176,10 +177,39 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     hdr.bpp = wxUINT16_SWAP_ON_BE(bpp);
     hdr.compression = 0; // RGB uncompressed
     hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight());
     hdr.bpp = wxUINT16_SWAP_ON_BE(bpp);
     hdr.compression = 0; // RGB uncompressed
     hdr.size_of_bmp = wxUINT32_SWAP_ON_BE(row_width * image->GetHeight());

-    hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72);  // 72dpi is standard
+
+    // get the resolution from the image options  or fall back to 72dpi standard
+    // for the BMP format if not specified
+    int hres, vres;
+    switch ( GetResolutionFromOptions(*image, &hres, &vres) )
+    {
+        default:
+            wxFAIL_MSG( _T("unexpected image resolution units") );
+            // fall through
+
+        case wxIMAGE_RESOLUTION_NONE:
+            hres =
+            vres = 72;
+            // fall through to convert it to correct units
+
+        case wxIMAGE_RESOLUTION_INCHES:
+            // convert resolution in inches to resolution in centimeters
+            hres = (int)(10*mm2inches*hres);
+            vres = (int)(10*mm2inches*vres);
+            // fall through to convert it to resolution in meters
+
+        case wxIMAGE_RESOLUTION_CM:
+            // convert resolution in centimeters to resolution in meters
+            hres *= 100;
+            vres *= 100;
+            break;
+    }
+
+    hdr.h_res = wxUINT32_SWAP_ON_BE(hres);
+    hdr.v_res = wxUINT32_SWAP_ON_BE(vres);

     hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
     hdr.num_signif_clrs = 0;     // all colors are significant
     hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
     hdr.num_signif_clrs = 0;     // all colors are significant

-    
+

     if ( IsBmp )
     {
         if (// VS: looks ugly but compilers tend to do ugly things with structs,
     if ( IsBmp )
     {
         if (// VS: looks ugly but compilers tend to do ugly things with structs,


@@ -188,12 +218,12 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             !stream.Write(&hdr.magic, 2) ||
             !stream.Write(&hdr.filesize, 4) ||
             !stream.Write(&hdr.reserved, 4) ||
             !stream.Write(&hdr.magic, 2) ||
             !stream.Write(&hdr.filesize, 4) ||
             !stream.Write(&hdr.reserved, 4) ||

-            !stream.Write(&hdr.data_offset, 4) 
+            !stream.Write(&hdr.data_offset, 4)

            )
         {
             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 )


@@ -214,7 +244,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;

         }
     }
 
         }
     }
 


@@ -265,16 +295,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;
         }
     }


@@ -293,7 +323,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;


@@ -328,9 +358,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;


@@ -362,7 +392,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) |


@@ -370,7 +400,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;


@@ -384,14 +414,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;


@@ -404,7 +435,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)) |


@@ -412,7 +443,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.))     ))    );

             }
         }
 
             }
         }
 


@@ -425,7 +456,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;


@@ -434,56 +465,79 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 #endif // wxUSE_PALETTE
     delete q_image;
 
 #endif // wxUSE_PALETTE
     delete q_image;
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 

-typedef struct
+struct BMPPalette

 {
 {

+    static void Free(BMPPalette* pal) { delete [] pal; }
+

     unsigned char r, g, b;
     unsigned char r, g, b;

-}  _cmap;
+};

 
 

-bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height, 
+bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,

                              int bpp, int ncolors, int comp,
                              int bpp, int ncolors, int comp,

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

                              bool verbose, bool IsBmp, bool hasPalette)
 {
                              bool verbose, bool IsBmp, bool hasPalette)
 {

-    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0;
-    int             rshift = 0, gshift = 0, bshift = 0;
+    wxInt32         aDword, rmask = 0, gmask = 0, bmask = 0, amask = 0;
+    int             rshift = 0, gshift = 0, bshift = 0, ashift = 0;
+    int             rbits = 0, gbits = 0, bbits = 0;

     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
     wxUint8         aByte;
     wxUint16        aWord;
 
     // allocate space for palette if needed:
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
     wxUint8         aByte;
     wxUint16        aWord;
 
     // allocate space for palette if needed:

-    _cmap *cmap = NULL;
+    BMPPalette *cmap;

 
     if ( bpp < 16 )
     {
 
     if ( bpp < 16 )
     {

-        cmap = new _cmap[ncolors];
+        cmap = new BMPPalette[ncolors];

         if ( !cmap )
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't allocate memory."));
         if ( !cmap )
         {
             if (verbose)
                 wxLogError(_("BMP: Couldn't allocate memory."));

-            return FALSE;
+            return false;

         }
     }
         }
     }

-    else
+    else // no palette
+    {

         cmap = NULL;
         cmap = NULL;

+    }
+
+    wxON_BLOCK_EXIT1(&BMPPalette::Free, cmap);

 
     // destroy existing here instead of:
     image->Destroy();
     image->Create(width, height);
 
     // destroy existing here instead of:
     image->Destroy();
     image->Create(width, height);

-    
+

     unsigned char *ptr = image->GetData();
 
     if ( !ptr )
     {
         if ( verbose )
             wxLogError( _("BMP: Couldn't allocate memory.") );
     unsigned char *ptr = image->GetData();
 
     if ( !ptr )
     {
         if ( verbose )
             wxLogError( _("BMP: Couldn't allocate memory.") );

-        if ( cmap )
-            delete[] cmap;
-        return FALSE;
+        return false;
+    }
+
+    unsigned char *alpha;
+    if ( bpp == 32 )
+    {
+        // tell the image to allocate an alpha buffer
+        image->SetAlpha();
+        alpha = image->GetAlpha();
+        if ( !alpha )
+        {
+            if ( verbose )
+                wxLogError(_("BMP: Couldn't allocate memory."));
+            return false;
+        }
+    }
+    else // no alpha
+    {
+        alpha = NULL;

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


@@ -508,9 +562,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 );

             }
         }
 
             }
         }
 


@@ -529,11 +583,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         {
             int bit = 0;
             stream.Read(dbuf, 4 * 3);
         {
             int bit = 0;
             stream.Read(dbuf, 4 * 3);

-            bmask = wxINT32_SWAP_ON_BE(dbuf[0]);
+            rmask = wxINT32_SWAP_ON_BE(dbuf[0]);

             gmask = wxINT32_SWAP_ON_BE(dbuf[1]);
             gmask = wxINT32_SWAP_ON_BE(dbuf[1]);

-            rmask = wxINT32_SWAP_ON_BE(dbuf[2]);
-            // find shift amount.. ugly, but i can't think of a better way:
-            for (bit = 0; bit < bpp; bit++)
+            bmask = wxINT32_SWAP_ON_BE(dbuf[2]);
+            // find shift amount (Least significant bit of mask)
+            for (bit = bpp-1; bit>=0; bit--)

             {
                 if (bmask & (1 << bit))
                     bshift = bit;
             {
                 if (bmask & (1 << bit))
                     bshift = bit;


@@ -542,6 +596,16 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                 if (rmask & (1 << bit))
                     rshift = bit;
             }
                 if (rmask & (1 << bit))
                     rshift = bit;
             }

+            // Find number of bits in mask (MSB-LSB+1)
+            for (bit = 0; bit < bpp; bit++)
+            {
+                if (bmask & (1 << bit))
+                    bbits = bit-bshift+1;
+                if (gmask & (1 << bit))
+                    gbits = bit-gshift+1;
+                if (rmask & (1 << bit))
+                    rbits = bit-rshift+1;
+            }

         }
         else if ( bpp == 16 )
         {
         }
         else if ( bpp == 16 )
         {


@@ -551,15 +615,24 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
             rshift = 10;
             gshift = 5;
             bshift = 0;
             rshift = 10;
             gshift = 5;
             bshift = 0;

+            rbits = 5;
+            gbits = 5;
+            bbits = 5;

         }
         else if ( bpp == 32 )
         {
             rmask = 0x00FF0000;
             gmask = 0x0000FF00;
             bmask = 0x000000FF;
         }
         else if ( bpp == 32 )
         {
             rmask = 0x00FF0000;
             gmask = 0x0000FF00;
             bmask = 0x000000FF;

+            amask = 0xFF000000;
+
+            ashift = 24;

             rshift = 16;
             gshift = 8;
             bshift = 0;
             rshift = 16;
             gshift = 8;
             bshift = 0;

+            rbits = 8;
+            gbits = 8;
+            bbits = 8;

         }
     }
 
         }
     }
 


@@ -567,7 +640,11 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
      * Reading the image data
      */
     if ( IsBmp )
      * Reading the image data
      */
     if ( IsBmp )

-        stream.SeekI(bmpOffset); // else icon, just carry on
+    {
+        if (stream.SeekI(bmpOffset) == wxInvalidOffset)
+            return false;
+        //else: icon, just carry on
+    }

 
     unsigned char *data = ptr;
 
 
     unsigned char *data = ptr;
 


@@ -583,27 +660,23 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
         ptr = data;
     }
 
         ptr = data;
     }
 

-    int line = 0;
-    int column = 0;

     int linesize = ((width * bpp + 31) / 32) * 4;
 
     /* BMPs are stored upside down */
     int linesize = ((width * bpp + 31) / 32) * 4;
 
     /* BMPs are stored upside down */

-    for ( line = (height - 1); line >= 0; line-- )
+    for ( int line = (height - 1); line >= 0; line-- )

     {
         int linepos = 0;
     {
         int linepos = 0;

-        for ( column = 0; column < width; )
+        for ( int column = 0; column < width ; )

         {
             if ( bpp < 16 )
             {
         {
             if ( bpp < 16 )
             {

-                int index = 0;

                 linepos++;
                 aByte = stream.GetC();
                 if ( bpp == 1 )
                 {
                 linepos++;
                 aByte = stream.GetC();
                 if ( bpp == 1 )
                 {

-                    int bit = 0;
-                    for (bit = 0; bit < 8 && column < width; bit++)
+                    for (int bit = 0; bit < 8 && column < width; bit++)

                     {
                     {

-                        index = ((aByte & (0x80 >> bit)) ? 1 : 0);
+                        int index = ((aByte & (0x80 >> bit)) ? 1 : 0);

                         ptr[poffset] = cmap[index].r;
                         ptr[poffset + 1] = cmap[index].g;
                         ptr[poffset + 2] = cmap[index].b;
                         ptr[poffset] = cmap[index].r;
                         ptr[poffset + 1] = cmap[index].g;
                         ptr[poffset + 2] = cmap[index].b;


@@ -614,18 +687,76 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                 {
                     if ( comp == BI_RLE4 )
                     {
                 {
                     if ( comp == BI_RLE4 )
                     {

-                        if ( verbose )
-                            wxLogError(_("DIB Header: Cannot deal with 4bit encoded yet."));
-                        image->Destroy();
-                        delete[] cmap;
-                        return FALSE;
+                        wxUint8 first;
+                        first = aByte;
+                        aByte = stream.GetC();
+                        if ( first == 0 )
+                        {
+                            if ( aByte == 0 )
+                            {
+                                if ( column > 0 )
+                                    column = width;
+                            }
+                            else if ( aByte == 1 )
+                            {
+                                column = width;
+                                line = -1;
+                            }
+                            else if ( aByte == 2 )
+                            {
+                                aByte = stream.GetC();
+                                column += aByte;
+                                linepos = column * bpp / 4;
+                                aByte = stream.GetC();
+                                line -= aByte; // upside down
+                            }
+                            else
+                            {
+                                int absolute = aByte;
+                                wxUint8 nibble[2] ;
+                                int readBytes = 0 ;
+                                for (int k = 0; k < absolute; k++)
+                                {
+                                    if ( !(k % 2 ) )
+                                    {
+                                        ++readBytes ;
+                                        aByte = stream.GetC();
+                                        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 + 2] = cmap[nibble[k%2]].b;
+                                    column++;
+                                    if ( k % 2 )
+                                        linepos++;
+                                }
+                                if ( readBytes & 0x01 )
+                                    aByte = stream.GetC();
+                            }
+                        }
+                        else
+                        {
+                            wxUint8 nibble[2] ;
+                            nibble[0] = (wxUint8)( (aByte & 0xF0) >> 4 ) ;
+                            nibble[1] = (wxUint8)( aByte & 0x0F ) ;
+
+                            for ( int l = 0; l < first && column < width; l++ )
+                            {
+                                ptr[poffset    ] = cmap[nibble[l%2]].r;
+                                ptr[poffset + 1] = cmap[nibble[l%2]].g;
+                                ptr[poffset + 2] = cmap[nibble[l%2]].b;
+                                column++;
+                                if ( l % 2 )
+                                    linepos++;
+                            }
+                        }

                     }
                     else
                     {
                     }
                     else
                     {

-                        int nibble = 0;
-                        for (nibble = 0; nibble < 2 && column < width; nibble++)
+                        for (int nibble = 0; nibble < 2 && column < width; nibble++)

                         {
                         {

-                            index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4));
+                            int index = ((aByte & (0xF0 >> nibble * 4)) >> (!nibble * 4));

                             if ( index >= 16 )
                                 index = 15;
                             ptr[poffset] = cmap[index].r;
                             if ( index >= 16 )
                                 index = 15;
                             ptr[poffset] = cmap[index].r;


@@ -698,76 +829,84 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
                         // linepos += size;    seems to be wrong, RR
                     }
                 }
                         // linepos += size;    seems to be wrong, RR
                     }
                 }

-               }
-               else if ( bpp == 24 )
-               {
-                   stream.Read(bbuf, 3);
-                   linepos += 3;
-                   ptr[poffset    ] = (unsigned char)bbuf[2];
-                   ptr[poffset + 1] = (unsigned char)bbuf[1];
-                   ptr[poffset + 2] = (unsigned char)bbuf[0];
-                   column++;
-               }
-               else if ( bpp == 16 )
-               {
-                   unsigned char temp;
-                   stream.Read(&aWord, 2);
-                   aWord = wxUINT16_SWAP_ON_BE(aWord);
-                   linepos += 2;
-                   temp = (aWord & rmask) >> rshift;
-                   ptr[poffset] = temp;
-                   temp = (aWord & gmask) >> gshift;
-                   ptr[poffset + 1] = temp;
-                   temp = (aWord & bmask) >> bshift;
-                   ptr[poffset + 2] = temp;
-                   column++;
-               }
-               else
-               {
-                   unsigned char temp;
-                   stream.Read(&aDword, 4);
-                   aDword = wxINT32_SWAP_ON_BE(aDword);
-                   linepos += 4;
-                   temp = (aDword & rmask) >> rshift;
-                   ptr[poffset] = temp;
-                   temp = (aDword & gmask) >> gshift;
-                   ptr[poffset + 1] = temp;
-                   temp = (aDword & bmask) >> bshift;
-                   ptr[poffset + 2] = temp;
-                   column++;
-               }
-          }
-          while ( (linepos < linesize) && (comp != 1) && (comp != 2) )
-          {
-              stream.Read(&aByte, 1);
-              linepos += 1;
-              if ( stream.LastError() != wxStream_NOERROR )
-                  break;
-          }
-     }
-     if (cmap)
-       delete[] cmap;
-
-     image->SetMask(FALSE);
-
-    return stream.IsOk();
+            }
+            else if ( bpp == 24 )
+            {
+                stream.Read(bbuf, 3);
+                linepos += 3;
+                ptr[poffset    ] = (unsigned char)bbuf[2];
+                ptr[poffset + 1] = (unsigned char)bbuf[1];
+                ptr[poffset + 2] = (unsigned char)bbuf[0];
+                column++;
+            }
+            else if ( bpp == 16 )
+            {
+                unsigned char temp;
+                stream.Read(&aWord, 2);
+                aWord = wxUINT16_SWAP_ON_BE(aWord);
+                linepos += 2;
+                /* use the masks and calculated amonut of shift
+                   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 = (unsigned char)((aWord & rmask) >> rshift << (8-rbits));
+                ptr[poffset] = temp;
+                temp = (unsigned char)((aWord & gmask) >> gshift << (8-gbits));
+                ptr[poffset + 1] = temp;
+                temp = (unsigned char)((aWord & bmask) >> bshift << (8-bbits));
+                ptr[poffset + 2] = temp;
+                column++;
+            }
+            else
+            {
+                unsigned char temp;
+                stream.Read(&aDword, 4);
+                aDword = wxINT32_SWAP_ON_BE(aDword);
+                linepos += 4;
+                temp = (unsigned char)((aDword & rmask) >> rshift);
+                ptr[poffset] = temp;
+                temp = (unsigned char)((aDword & gmask) >> gshift);
+                ptr[poffset + 1] = temp;
+                temp = (unsigned char)((aDword & bmask) >> bshift);
+                ptr[poffset + 2] = temp;
+                if ( alpha )
+                {
+                    temp = (unsigned char)((aDword & amask) >> ashift);
+                    alpha[line * width + column] = temp;
+                }
+                column++;
+            }
+        }
+        while ( (linepos < linesize) && (comp != 1) && (comp != 2) )
+        {
+            stream.Read(&aByte, 1);
+            linepos += 1;
+            if ( !stream )
+                break;
+        }
+    }
+
+    image->SetMask(false);
+
+    const wxStreamError err = stream.GetLastError();
+    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;

 }
 
 }
 

-bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream, 
+bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,

                            bool verbose, bool IsBmp)
 {
     wxUint16        aWord;
     wxInt32         dbuf[4];
     wxInt8          bbuf[4];
                            bool verbose, bool IsBmp)
 {
     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);


@@ -782,21 +921,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 ( !IsBmp)height = height  / 2; // for icons divide by 2

-        
+

     if ( width > 32767 )
     {
         if (verbose)
             wxLogError( _("DIB Header: Image width > 32767 pixels for file.") );
     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);


@@ -805,26 +944,27 @@ 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]);
-    if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && 
+    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.") );
          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 */


@@ -834,16 +974,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)
     {
         if (verbose)

-            wxLogError( _("Error in reading image DIB .") );
-        return FALSE;
+            wxLogError( _("Error in reading image DIB.") );
+        return false;

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


@@ -852,35 +992,44 @@ 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;
+    // the resolution in the bitmap header is in meters, convert to centimeters
+    image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, wxIMAGE_RESOLUTION_CM);
+    image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, dbuf[2]/100);
+    image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, dbuf[3]/100);
+
+    return true;

 }
 
 }
 

-bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream, 
+bool wxBMPHandler::LoadFile(wxImage *image, wxInputStream& stream,

                             bool verbose, int WXUNUSED(index))
 {
     // Read a single DIB fom the file:
                             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)
 {
     unsigned char hdr[2];
 
 }
 
 bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 {
     unsigned char hdr[2];
 

-    stream.Read(hdr, 2);
-    stream.SeekI(-2, wxFromCurrent);
-    return (hdr[0] == 'B' && hdr[1] == 'M');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        return false;
+
+    // do we have the BMP file signature?
+    return hdr[0] == 'B' && hdr[1] == 'M';

 }
 
 }
 

+#endif // wxUSE_STREAMS
+

 
 #if wxUSE_ICO_CUR
 //-----------------------------------------------------------------------------
 
 #if wxUSE_ICO_CUR
 //-----------------------------------------------------------------------------


@@ -889,6 +1038,8 @@ bool wxBMPHandler::DoCanRead(wxInputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxICOHandler, wxBMPHandler)
 

+#if wxUSE_STREAMS
+

 struct ICONDIRENTRY
 {
     wxUint8         bWidth;               // Width of the image
 struct ICONDIRENTRY
 {
     wxUint8         bWidth;               // Width of the image


@@ -918,24 +1069,23 @@ 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 
+    // 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
     //     the actual (handler) type when the code has to distinguish between
     //     the two formats
     //     identical, we have all the meat in wxICOHandler and check for
     //     the actual (handler) type when the code has to distinguish between
     //     the two formats


@@ -947,8 +1097,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));


@@ -956,17 +1106,17 @@ 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;
 
         if ( image->HasMask() )
     {
         wxImage mask;
 
         if ( image->HasMask() )

-        {            
+        {

             // make another image with black/white:
             mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
 
             // make another image with black/white:
             mask = image->ConvertToMono (image->GetMaskRed(), image->GetMaskGreen(), image->GetMaskBlue() );
 


@@ -982,8 +1132,8 @@ bool wxICOHandler::SaveFile(wxImage *image,
                 {
                     for (j = 0; j < mask.GetHeight(); j++)
                     {
                 {
                     for (j = 0; j < mask.GetHeight(); j++)
                     {

-                        if ((r == mask.GetRed(i, j)) && 
-                            (g == mask.GetGreen(i, j))&& 
+                        if ((r == mask.GetRed(i, j)) &&
+                            (g == mask.GetGreen(i, j))&&

                             (b == mask.GetBlue(i, j)) )
                                 image->SetRGB(i, j, 0, 0, 0 );
                     }
                             (b == mask.GetBlue(i, j)) )
                                 image->SetRGB(i, j, 0, 0, 0 );
                     }


@@ -1001,59 +1151,59 @@ bool wxICOHandler::SaveFile(wxImage *image,
         }
         // Set the formats for image and mask
         // (Windows never saves with more than 8 colors):
         }
         // Set the formats for image and mask
         // (Windows never saves with more than 8 colors):

-        image->SetOption(wxBMP_FORMAT, wxBMP_8BPP);
+        image->SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_8BPP);

 
         // monochome bitmap:
 
         // monochome bitmap:

-        mask.SetOption(wxBMP_FORMAT, wxBMP_1BPP_BW);
-        bool IsBmp = FALSE;
-        bool IsMask = FALSE;
+        mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);
+        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::IsOk() 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.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
         if ( type == 2 /*CUR*/)
         {
         icondirentry.bColorCount = 0;
         icondirentry.bReserved = 0;
         icondirentry.wPlanes = wxUINT16_SWAP_ON_BE(1);
         icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
         if ( type == 2 /*CUR*/)
         {

-            int hx = image->HasOption(wxCUR_HOTSPOT_X) ?
-                         image->GetOptionInt(wxCUR_HOTSPOT_X) :
+            int hx = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) :

                          image->GetWidth() / 2;
                          image->GetWidth() / 2;

-            int hy = image->HasOption(wxCUR_HOTSPOT_Y) ?
-                         image->GetOptionInt(wxCUR_HOTSPOT_Y) :
+            int hy = image->HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ?
+                         image->GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) :

                          image->GetHeight() / 2;
 
             // actually write the values of the hot spot here:
                          image->GetHeight() / 2;
 
             // actually write the values of the hot spot here:


@@ -1079,54 +1229,55 @@ 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,

                             bool verbose, int index)
 {
                             bool verbose, int index)
 {

-    stream.SeekI(0);
+    if (stream.SeekI(0) == wxInvalidOffset)
+        return false;

     return DoLoadFile(image, stream, verbose, index);
 }
 
     return DoLoadFile(image, stream, verbose, index);
 }
 

-bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream, 
-                            bool 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:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);
     stream.Read(&IconDir, sizeof(IconDir));
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     // nType is 1 for Icons, 2 for Cursors:
     wxUint16 nType = wxUINT16_SWAP_ON_BE(IconDir.idType);

-    
+

     // loop round the icons and choose the best one:
     ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
     ICONDIRENTRY *pCurrentEntry = pIconDirEntry;
     // loop round the icons and choose the best one:
     ICONDIRENTRY *pIconDirEntry = new ICONDIRENTRY[nIcons];
     ICONDIRENTRY *pCurrentEntry = pIconDirEntry;


@@ -1144,7 +1295,7 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
             if ( pCurrentEntry->bColorCount == 0 )
                 pCurrentEntry->bColorCount = 255;
             if ( pCurrentEntry->bColorCount >= colmax )
             if ( pCurrentEntry->bColorCount == 0 )
                 pCurrentEntry->bColorCount = 255;
             if ( pCurrentEntry->bColorCount >= colmax )

-            {                
+            {

                 iSel = i;
                 wMax = pCurrentEntry->bWidth;
                 colmax = pCurrentEntry->bColorCount;
                 iSel = i;
                 wMax = pCurrentEntry->bWidth;
                 colmax = pCurrentEntry->bColorCount;


@@ -1152,31 +1303,32 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
         }
         pCurrentEntry++;
     }
         }
         pCurrentEntry++;
     }

-    
+

     if ( index != -1 )
     {
         // VS: Note that we *have* to run the loop above even if index != -1, because
         //     it reads ICONDIRENTRies.
         iSel = index;
     }
     if ( index != -1 )
     {
         // VS: Note that we *have* to run the loop above even if index != -1, because
         //     it reads ICONDIRENTRies.
         iSel = index;
     }

-    
+

     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;
     }
     else
     {
         // seek to selected icon:
         pCurrentEntry = pIconDirEntry + iSel;

-        stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart);
-        bResult = LoadDib(image, stream, TRUE, IsBmp);
+        if (stream.SeekI(iPos + wxUINT32_SWAP_ON_BE(pCurrentEntry->dwImageOffset), wxFromStart) == wxInvalidOffset)
+            return false;
+        bResult = LoadDib(image, stream, true, IsBmp);

         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         {
             // it is a cursor, so let's set the hotspot:
         bool bIsCursorType = (this->GetType() == wxBITMAP_TYPE_CUR) || (this->GetType() == wxBITMAP_TYPE_ANI);
         if ( bResult && bIsCursorType && nType == 2 )
         {
             // it is a cursor, so let's set the hotspot:

-            image->SetOption(wxCUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
-            image->SetOption(wxCUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, wxUINT16_SWAP_ON_BE(pCurrentEntry->wPlanes));
+            image->SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, wxUINT16_SWAP_ON_BE(pCurrentEntry->wBitCount));

         }
     }
     delete[] pIconDirEntry;
         }
     }
     delete[] pIconDirEntry;


@@ -1186,25 +1338,30 @@ 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();
-    stream.SeekI(0);
-    stream.Read(&IconDir, sizeof(IconDir));
+    wxFileOffset iPos = stream.TellI();
+    if (stream.SeekI(0) == wxInvalidOffset)
+        return 0;
+    if (stream.Read(&IconDir, sizeof(IconDir)).LastRead() != sizeof(IconDir))
+        return 0;

     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);
     wxUint16 nIcons = wxUINT16_SWAP_ON_BE(IconDir.idCount);

-    stream.SeekI(iPos);
+    if (stream.SeekI(iPos) == wxInvalidOffset)
+        return 0;

     return (int)nIcons;
 }
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {
     return (int)nIcons;
 }
 
 bool wxICOHandler::DoCanRead(wxInputStream& stream)
 {

+    if (stream.SeekI(0) == wxInvalidOffset)
+        return false;

     unsigned char hdr[4];
     unsigned char hdr[4];

-    off_t iPos = stream.TellI();
-    stream.SeekI (0);
-    stream.Read(hdr, 4);
-    stream.SeekI(iPos);
-    //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');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        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';

 }
 
 }
 

+#endif // wxUSE_STREAMS

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -1213,165 +1370,57 @@ bool wxICOHandler::DoCanRead(wxInputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCURHandler, wxICOHandler)
 

+#if wxUSE_STREAMS
+

 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {
 bool wxCURHandler::DoCanRead(wxInputStream& stream)
 {

+    if (stream.SeekI(0) == wxInvalidOffset)
+        return false;

     unsigned char hdr[4];
     unsigned char hdr[4];

-    off_t iPos = stream.TellI();
-    stream.SeekI (0);
-    stream.Read(hdr, 4);
-    stream.SeekI(iPos);
-    //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');
+    if ( !stream.Read(hdr, WXSIZEOF(hdr)) )
+        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';

 }
 
 }
 

+#endif // wxUSE_STREAMS
+

 //-----------------------------------------------------------------------------
 // wxANIHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 
 //-----------------------------------------------------------------------------
 // wxANIHandler
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 

-bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream, 
-                            bool verbose, int index)
+#if wxUSE_STREAMS
+
+bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
+                            bool WXUNUSED(verbose), int index)

 {
 {

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen;        
-    static const char *rifftxt = "RIFF";
-    static const char *listtxt = "LIST";
-    static const char *icotxt  = "icon";
-
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *ico32  = (wxInt32 *) icotxt;
-
-    int iIcon = 0;
-    
-    stream.SeekI(0);
-    stream.Read(&FCC1, 4);
-    if ( FCC1 != *riff32 ) 
-        return FALSE;
-
-    // we have a riff file:
-    while (stream.IsOk())
-    {                    
-        // we always have a data size
-        stream.Read(&datalen, 4);
-
-        //now either data or a FCC
-        if ( (FCC1 == *riff32) || (FCC1 == *list32) )
-        {
-           stream.Read(&FCC2, 4);
-        }
-        else 
-        {
-            if (FCC1 == *ico32 && iIcon >= index)
-            {
-                return DoLoadFile(image, stream, verbose, -1);
-            }    
-            else
-            {
-                stream.SeekI(stream.TellI() + datalen);
-                if ( FCC1 == *ico32 )
-                    iIcon ++;
-            }
-        }
-        
-        // try to read next data chunk:
-        stream.Read(&FCC1, 4);
-    }
-    return FALSE;
+    wxANIDecoder decoder;
+    if (!decoder.Load(stream))
+        return false;
+
+    return decoder.ConvertToImage(index != -1 ? (size_t)index : 0, image);

 }
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {
 }
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen ;        
-    static const char *rifftxt = "RIFF";
-    static const char *listtxt = "LIST";
-    static const char *anihtxt = "anih";
-
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
-            
-    stream.SeekI(0);
-    stream.Read(&FCC1, 4);
-    if ( FCC1 != *riff32 ) 
-        return FALSE;
-
-    // we have a riff file:
-    while ( stream.IsOk() )
-    {
-        if ( FCC1 != *anih32 )
-            return TRUE;    
-        // we always have a data size:
-        stream.Read(&datalen, 4);
- 
-        // now either data or a FCC:
-        if ( (FCC1 == *riff32) || (FCC1 == *list32) ) 
-        {
-                   stream.Read(&FCC2, 4);
-        }
-        else 
-        {
-            stream.SeekI(stream.TellI() + datalen);
-        }
-        
-        // try to read next data chunk:
-        stream.Read(&FCC1, 4);
-    }
-
-    return FALSE;
+    wxANIDecoder decod;
+    return decod.CanRead(stream);

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

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen ;        
-    static const char *rifftxt = "RIFF";
-    static const char *listtxt = "LIST";
-    static const char *anihtxt = "anih";
-
-    wxInt32 *riff32 = (wxInt32 *) rifftxt;
-    wxInt32 *list32 = (wxInt32 *) listtxt;
-    wxInt32 *anih32 = (wxInt32 *) anihtxt;
-            
-    stream.SeekI(0);
-    stream.Read(&FCC1, 4);
-    if ( FCC1 != *riff32 )
+    wxANIDecoder decoder;
+    if (!decoder.Load(stream))

         return wxNOT_FOUND;
 
         return wxNOT_FOUND;
 

-    // we have a riff file:
-    while ( stream.IsOk() )
-    {
-        // we always have a data size:
-        stream.Read(&datalen, 4);
- 
-        // now either data or a FCC:
-        if ( (FCC1 == *riff32) || (FCC1 == *list32) ) 
-       {
-           stream.Read(&FCC2, 4);
-        }
-        else
-        {
-            if ( FCC1 == *anih32 )
-            {
-                wxUint32 *pData = new wxUint32[datalen/4];
-                stream.Read(pData, datalen);
-                int nIcons = *(pData + 1);
-                delete[] pData;
-                return nIcons;
-            }
-            else 
-                stream.SeekI(stream.TellI() + datalen);
-        }
-        
-        // try to read next data chunk:
-        stream.Read(&FCC1, 4);
-    }
-
-    return wxNOT_FOUND;
+    return decoder.GetFrameCount();

 }
 
 }
 

+#endif // wxUSE_STREAMS
+

 #endif // wxUSE_ICO_CUR
 
 #endif // wxUSE_ICO_CUR
 

-#endif // wxUSE_IMAGE && wxUSE_STREAMS
+#endif // wxUSE_IMAGE