Committing in .

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index db3f1e2b40b08783ceb66fb76ce6cf741e1c3d5a..52dade70e42264231a62c40ebddc439b5708b889 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -97,12 +97,12 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     int height = (int)wxINT32_SWAP_ON_BE( dbuf[1] );
     if (width > 32767)
     {
     int height = (int)wxINT32_SWAP_ON_BE( dbuf[1] );
     if (width > 32767)
     {

-        wxLogError( _T("Image width > 32767 pixels for file.") );
+        wxLogError( wxT("Image width > 32767 pixels for file.") );

         return FALSE;
     }
     if (height > 32767)
     {
         return FALSE;
     }
     if (height > 32767)
     {

-        wxLogError( _T("Image height > 32767 pixels for file.") );
+        wxLogError( wxT("Image height > 32767 pixels for file.") );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -115,7 +115,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     int bpp = (int)wxUINT16_SWAP_ON_BE( aWord );
     if (bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32)
     {
     int bpp = (int)wxUINT16_SWAP_ON_BE( aWord );
     if (bpp != 1 && bpp != 4 && bpp != 8 && bpp != 16 && bpp != 24 && bpp != 32)
     {

-        wxLogError( _T("unknown bitdepth in file.") );
+        wxLogError( wxT("unknown bitdepth in file.") );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -123,7 +123,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     int comp = (int)wxINT32_SWAP_ON_BE( dbuf[0] );
     if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
     {
     int comp = (int)wxINT32_SWAP_ON_BE( dbuf[0] );
     if (comp != BI_RGB && comp != BI_RLE4 && comp != BI_RLE8 && comp != BI_BITFIELDS)
     {

-        wxLogError( _T("unknown encoding in Windows BMP file.") );
+        wxLogError( wxT("unknown encoding in Windows BMP file.") );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -136,7 +136,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
         ((comp == BI_RLE8) && (bpp != 8)) ||
         ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {
         ((comp == BI_RLE8) && (bpp != 8)) ||
         ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {

-        wxLogError( _T("encoding of BMP doesn't match bitdepth.") );
+        wxLogError( wxT("encoding of BMP doesn't match bitdepth.") );

         return FALSE;
     }
     if (bpp < 16)
         return FALSE;
     }
     if (bpp < 16)


@@ -144,7 +144,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
         cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
         if (!cmap)
         {
         cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
         if (!cmap)
         {

-            wxLogError( _T("Cannot allocate RAM for color map in BMP file.") );
+            wxLogError( wxT("Cannot allocate RAM for color map in BMP file.") );

             return FALSE;
         }
     }
             return FALSE;
         }
     }


@@ -155,7 +155,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {

-        wxLogError( _T("Cannot allocate RAM for RGB data in file.") );
+        wxLogError( wxT("Cannot allocate RAM for RGB data in file.") );

         if (cmap)
             free(cmap);
         return FALSE;
         if (cmap)
             free(cmap);
         return FALSE;


@@ -263,7 +263,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
                 {
                     if (comp == BI_RLE4)
                     {
                 {
                     if (comp == BI_RLE4)
                     {

-                        wxLogError( _T("Can't deal with 4bit encoded yet.") );
+                        wxLogError( wxT("Can't deal with 4bit encoded yet.") );

                         image->Destroy();
                         free(cmap);
                         return FALSE;
                         image->Destroy();
                         free(cmap);
                         return FALSE;


@@ -366,7 +366,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
                    ptr[poffset] = temp;
                    temp = (aWord & gmask) >> gshift;
                    ptr[poffset + 1] = temp;
                    ptr[poffset] = temp;
                    temp = (aWord & gmask) >> gshift;
                    ptr[poffset + 1] = temp;

-                   temp = (aWord & bmask) >> gshift;
+                   temp = (aWord & bmask) >> bshift;

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


@@ -401,6 +401,15 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
      return TRUE;
 }
 
      return TRUE;
 }
 

+bool wxBMPHandler::DoCanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+
+    stream.Read(&hdr, 2);
+    stream.SeekI(-2, wxFromCurrent);
+    return (hdr[0] == 'B' && hdr[1] == 'M');
+}
+

 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS