Committing in .

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 7bbac0ed60c716e879815f79d8ce3e00735c9101..f8552ff5a55be8ec951f4535014194675c529653 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -67,7 +67,7 @@ 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*/);
 }
 


@@ -82,17 +82,17 @@ bool wxBMPHandler::SaveDib(wxImage *image,
 
     if ( !image->Ok() )
     {
 
     if ( !image->Ok() )
     {

-        if ( verbose ) 
+        if ( verbose )

             wxLogError(_("BMP: Couldn't save invalid image."));
         return FALSE;
     }
 
     // get the format of the BMP file to save, else use 24bpp
     unsigned format = wxBMP_24BPP;
             wxLogError(_("BMP: Couldn't save invalid image."));
         return FALSE;
     }
 
     // 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,7 +117,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
             )
         {
             if ( verbose )
             )
         {
             if ( verbose )

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

             return FALSE;
         }
         bpp = 8;
             return FALSE;
         }
         bpp = 8;


@@ -179,7 +179,7 @@ bool wxBMPHandler::SaveDib(wxImage *image,
     hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72);  // 72dpi is standard
     hdr.num_clrs = wxUINT32_SWAP_ON_BE(palette_size); // # colors in colormap
     hdr.num_signif_clrs = 0;     // all colors are significant
     hdr.h_res = hdr.v_res = wxUINT32_SWAP_ON_BE(72);  // 72dpi is standard
     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,7 +188,7 @@ 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)
            )
         {
             if (verbose)


@@ -443,7 +443,7 @@ typedef struct
     unsigned char r, g, b;
 }  _cmap;
 
     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,
                              off_t bmpOffset, wxInputStream& stream,
                              bool verbose, bool IsBmp, bool hasPalette)
                              int bpp, int ncolors, int comp,
                              off_t bmpOffset, wxInputStream& stream,
                              bool verbose, bool IsBmp, bool hasPalette)


@@ -474,7 +474,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
     // 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 )
     unsigned char *ptr = image->GetData();
 
     if ( !ptr )


@@ -753,7 +753,7 @@ bool wxBMPHandler::DoLoadDib(wxImage * image, int width, int height,
     return stream.IsOk();
 }
 
     return stream.IsOk();
 }
 

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

                            bool verbose, bool IsBmp)
 {
     wxUint16        aWord;
                            bool verbose, bool IsBmp)
 {
     wxUint16        aWord;


@@ -785,7 +785,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
     int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]);
     if ( !IsBmp)height = height  / 2; // for icons divide by 2
     int width = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
     int height = (int)wxINT32_SWAP_ON_BE(dbuf[1]);
     if ( !IsBmp)height = height  / 2; // for icons divide by 2

-        
+

     if ( width > 32767 )
     {
         if (verbose)
     if ( width > 32767 )
     {
         if (verbose)


@@ -815,7 +815,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
 
     stream.Read(dbuf, 4 * 4);
     int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]);
 
     stream.Read(dbuf, 4 * 4);
     int comp = (int)wxINT32_SWAP_ON_BE(dbuf[0]);

-    if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && 
+    if ( comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 &&

          comp != BI_BITFIELDS )
     {
         if (verbose)
          comp != BI_BITFIELDS )
     {
         if (verbose)


@@ -865,7 +865,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
     return TRUE;
 }
 
     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:


@@ -935,7 +935,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
     int images = 1; // only generate one image
 
 
     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


@@ -966,7 +966,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
         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 +982,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,10 +1001,10 @@ 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);
+        mask.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP_BW);

         bool IsBmp = FALSE;
         bool IsMask = FALSE;
 
         bool IsBmp = FALSE;
         bool IsMask = FALSE;
 


@@ -1049,11 +1049,11 @@ bool wxICOHandler::SaveFile(wxImage *image,
         icondirentry.wBitCount = wxUINT16_SWAP_ON_BE(wxBMP_8BPP);
         if ( type == 2 /*CUR*/)
         {
         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:


@@ -1106,15 +1106,15 @@ bool wxICOHandler::SaveFile(wxImage *image,
     return TRUE;
 }
 
     return TRUE;
 }
 

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

                             bool verbose, int index)
 {
     stream.SeekI(0);
     return DoLoadFile(image, stream, verbose, index);
 }
 
                             bool verbose, int index)
 {
     stream.SeekI(0);
     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 = FALSE;
     bool IsBmp = FALSE;


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


@@ -1175,8 +1175,8 @@ bool wxICOHandler::DoLoadFile(wxImage *image, wxInputStream& stream,
         if ( bResult && bIsCursorType && nType == 2 )
         {
             // it is a cursor, so let's set the hotspot:
         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;


@@ -1230,11 +1230,11 @@ bool wxCURHandler::DoCanRead(wxInputStream& stream)
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxANIHandler, wxCURHandler)
 

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

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

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen;        
+    wxInt32 FCC1, FCC2;
+    wxUint32 datalen;

     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *icotxt  = "icon";
     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *icotxt  = "icon";


@@ -1244,29 +1244,29 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
     wxInt32 *ico32  = (wxInt32 *) icotxt;
 
     int iIcon = 0;
     wxInt32 *ico32  = (wxInt32 *) icotxt;
 
     int iIcon = 0;

-    
+

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

-    if ( FCC1 != *riff32 ) 
+    if ( FCC1 != *riff32 )

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

-    {                    
+    {

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

-
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;

         //now either data or a FCC
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
            stream.Read(&FCC2, 4);
         }
         //now either data or a FCC
         if ( (FCC1 == *riff32) || (FCC1 == *list32) )
         {
            stream.Read(&FCC2, 4);
         }

-        else 
+        else

         {
             if (FCC1 == *ico32 && iIcon >= index)
             {
                 return DoLoadFile(image, stream, verbose, -1);
         {
             if (FCC1 == *ico32 && iIcon >= index)
             {
                 return DoLoadFile(image, stream, verbose, -1);

-            }    
+            }

             else
             {
                 stream.SeekI(stream.TellI() + datalen);
             else
             {
                 stream.SeekI(stream.TellI() + datalen);


@@ -1274,7 +1274,7 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
                     iIcon ++;
             }
         }
                     iIcon ++;
             }
         }

-        
+

         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }
         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }


@@ -1283,8 +1283,8 @@ bool wxANIHandler::LoadFile(wxImage *image, wxInputStream& stream,
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {
 
 bool wxANIHandler::DoCanRead(wxInputStream& stream)
 {

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen ;        
+    wxInt32 FCC1, FCC2;
+    wxUint32 datalen ;

     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";


@@ -1292,30 +1292,30 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
     wxInt32 *riff32 = (wxInt32 *) rifftxt;
     wxInt32 *list32 = (wxInt32 *) listtxt;
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
     wxInt32 *riff32 = (wxInt32 *) rifftxt;
     wxInt32 *list32 = (wxInt32 *) listtxt;
     wxInt32 *anih32 = (wxInt32 *) anihtxt;

-            
+

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

-    if ( FCC1 != *riff32 ) 
+    if ( FCC1 != *riff32 )

         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {
         return FALSE;
 
     // we have a riff file:
     while ( stream.IsOk() )
     {

-        if ( FCC1 != *anih32 )
-            return TRUE;    
+        if ( FCC1 == *anih32 )
+            return TRUE;

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

- 
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;  

         // now either data or a FCC:
         // now either data or a FCC:

-        if ( (FCC1 == *riff32) || (FCC1 == *list32) ) 
+        if ( (FCC1 == *riff32) || (FCC1 == *list32) )

         {
                    stream.Read(&FCC2, 4);
         }
         {
                    stream.Read(&FCC2, 4);
         }

-        else 
+        else

         {
             stream.SeekI(stream.TellI() + datalen);
         }
         {
             stream.SeekI(stream.TellI() + datalen);
         }

-        
+

         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }
         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }


@@ -1325,8 +1325,8 @@ bool wxANIHandler::DoCanRead(wxInputStream& stream)
 
 int wxANIHandler::GetImageCount(wxInputStream& stream)
 {
 
 int wxANIHandler::GetImageCount(wxInputStream& stream)
 {

-    wxInt32 FCC1, FCC2; 
-    wxUint32 datalen ;        
+    wxInt32 FCC1, FCC2;
+    wxUint32 datalen ;

     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";
     static const char *rifftxt = "RIFF";
     static const char *listtxt = "LIST";
     static const char *anihtxt = "anih";


@@ -1334,7 +1334,7 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     wxInt32 *riff32 = (wxInt32 *) rifftxt;
     wxInt32 *list32 = (wxInt32 *) listtxt;
     wxInt32 *anih32 = (wxInt32 *) anihtxt;
     wxInt32 *riff32 = (wxInt32 *) rifftxt;
     wxInt32 *list32 = (wxInt32 *) listtxt;
     wxInt32 *anih32 = (wxInt32 *) anihtxt;

-            
+

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


@@ -1345,9 +1345,9 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
     {
         // we always have a data size:
         stream.Read(&datalen, 4);
     {
         // we always have a data size:
         stream.Read(&datalen, 4);

- 
+        datalen = wxINT32_SWAP_ON_BE(datalen) ;

         // now either data or a FCC:
         // now either data or a FCC:

-        if ( (FCC1 == *riff32) || (FCC1 == *list32) ) 
+        if ( (FCC1 == *riff32) || (FCC1 == *list32) )

        {
            stream.Read(&FCC2, 4);
         }
        {
            stream.Read(&FCC2, 4);
         }


@@ -1357,14 +1357,14 @@ int wxANIHandler::GetImageCount(wxInputStream& stream)
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);
             {
                 wxUint32 *pData = new wxUint32[datalen/4];
                 stream.Read(pData, datalen);

-                int nIcons = *(pData + 1);
+                int nIcons = wxINT32_SWAP_ON_BE(*(pData + 1));

                 delete[] pData;
                 return nIcons;
             }
                 delete[] pData;
                 return nIcons;
             }

-            else 
+            else

                 stream.SeekI(stream.TellI() + datalen);
         }
                 stream.SeekI(stream.TellI() + datalen);
         }

-        
+

         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }
         // try to read next data chunk:
         stream.Read(&FCC1, 4);
     }