Unicode overview added

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 05796710b46bef413db56df10f98547f9fd40514..468b1f5be56822d71e2301a788ff698f46262c6d 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -64,18 +64,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxBMPHandler,wxImageHandler)
 
 #define poffset (line * width * 3 + column * 3)
 
-bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
+bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
 {
     int             rshift = 0, gshift = 0, bshift = 0;
     wxUint8         aByte;
     wxUint16        aWord;
-    wxInt32         dbuf[4], aDword, 
+    wxInt32         dbuf[4], aDword,
                     rmask = 0, gmask = 0, bmask = 0;
     wxInt8          bbuf[4];
     struct _cmap {
         unsigned char r, g, b;
     } *cmap = NULL;
-    
+
     off_t start_offset = stream.TellI();
 
     image->Destroy();
@@ -87,7 +87,9 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     stream.Read( &bbuf, 2 );
     stream.Read( dbuf, 4 * 4 );
 
+#if 0 // unused
     wxInt32 size = wxINT32_SWAP_ON_BE( dbuf[0] );
+#endif
     wxInt32 offset = wxINT32_SWAP_ON_BE( dbuf[2] );
 
     stream.Read(dbuf, 4 * 2);
@@ -95,15 +97,15 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     int height = (int)wxINT32_SWAP_ON_BE( dbuf[1] );
     if (width > 32767)
     {
-        wxLogError( _T("Image width > 32767 pixels for file.") );
+        wxLogError( T("Image width > 32767 pixels for file.") );
         return FALSE;
     }
     if (height > 32767)
     {
-        wxLogError( _T("Image height > 32767 pixels for file.") );
+        wxLogError( T("Image height > 32767 pixels for file.") );
         return FALSE;
     }
-    
+
     stream.Read( &aWord, 2 );
 /*
     TODO
@@ -113,28 +115,28 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     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( T("unknown bitdepth in file.") );
         return FALSE;
     }
-    
+
     stream.Read( dbuf, 4 * 4 );
     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( T("unknown encoding in Windows BMP file.") );
         return FALSE;
     }
-    
+
     stream.Read( dbuf, 4 * 2 );
     int ncolors = (int)wxINT32_SWAP_ON_BE( dbuf[0] );
     if (ncolors == 0)
         ncolors = 1 << bpp;
     /* some more sanity checks */
-    if (((comp == BI_RLE4) && (bpp != 4)) || 
-        ((comp == BI_RLE8) && (bpp != 8)) || 
-       ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
+    if (((comp == BI_RLE4) && (bpp != 4)) ||
+        ((comp == BI_RLE8) && (bpp != 8)) ||
+        ((comp == BI_BITFIELDS) && (bpp != 16 && bpp != 32)))
     {
-        wxLogError( _T("encoding of BMP doesn't match bitdepth.") );
+        wxLogError( T("encoding of BMP doesn't match bitdepth.") );
         return FALSE;
     }
     if (bpp < 16)
@@ -142,7 +144,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
         cmap = (struct _cmap *)malloc(sizeof(struct _cmap) * ncolors);
         if (!cmap)
         {
-            wxLogError( _T("Cannot allocate RAM for color map in BMP file.") );
+            wxLogError( T("Cannot allocate RAM for color map in BMP file.") );
             return FALSE;
         }
     }
@@ -153,7 +155,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
-        wxLogError( _T("Cannot allocate RAM for RGB data in file.") );
+        wxLogError( T("Cannot allocate RAM for RGB data in file.") );
         if (cmap)
             free(cmap);
         return FALSE;
@@ -229,13 +231,13 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
         }
         ptr = data;
     }
-    
+
     int line = 0;
     int column = 0;
     int linesize = ((width * bpp + 31) / 32) * 4;
 
     /* BMPs are stored upside down */
-    for (line = (height - 1); line >= 0; line--) 
+    for (line = (height - 1); line >= 0; line--)
     {
         int linepos = 0;
         for (column = 0; column < width;)
@@ -261,7 +263,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                 {
                     if (comp == BI_RLE4)
                     {
-                        wxLogError( _T("Can't deal with 4bit encoded yet.") );
+                        wxLogError( T("Can't deal with 4bit encoded yet.") );
                         image->Destroy();
                         free(cmap);
                         return FALSE;
@@ -341,7 +343,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                         ptr[poffset + 1] = cmap[aByte].g;
                         ptr[poffset + 2] = cmap[aByte].b;
                         column++;
-                        linepos += size;
+                        // linepos += size;    seems to be wrong, RR
                     }
                 }
                }
@@ -358,7 +360,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                {
                    unsigned char temp;
                    stream.Read( &aWord, 2 );
-                  aWord = wxUINT16_SWAP_ON_BE( aWord );
+                   aWord = wxUINT16_SWAP_ON_BE( aWord );
                    linepos += 2;
                    temp = (aWord & rmask) >> rshift;
                    ptr[poffset] = temp;
@@ -372,7 +374,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                {
                    unsigned char temp;
                    stream.Read( &aDword, 4 );
-                  aDword = wxINT32_SWAP_ON_BE( aDword );
+                   aDword = wxINT32_SWAP_ON_BE( aDword );
                    linepos += 4;
                    temp = (aDword & rmask) >> rshift;
                    ptr[poffset] = temp;
@@ -391,7 +393,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
                   break;
           }
      }
-     if (cmap) 
+     if (cmap)
        free(cmap);
 
      image->SetMask( FALSE );
@@ -399,6 +401,15 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream )
      return TRUE;
 }
 
+bool wxBMPHandler::CanRead( wxInputStream& stream )
+{
+    unsigned char hdr[2];
+    
+    stream.Read(&hdr, 2);
+    stream.SeekI(-2, wxFromCurrent);
+    return (hdr[0] == 'B' && hdr[1] == 'M');
+}
+
 #endif // wxUSE_STREAMS