make --static flag act on --cppflags too.

[wxWidgets.git] / src / mgl / bitmap.cpp

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 8c634464e4c76cd924bc91a5595876fc683ef678..ca87f8483b61167d6cf3ba632c441357b80c45a8 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -2,7 +2,7 @@
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -48,8 +48,27 @@ static pixel_format_t gs_pixel_format_24 =
 static pixel_format_t gs_pixel_format_32 =
        {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
 
 static pixel_format_t gs_pixel_format_32 =
        {0xFF,0x18,0, 0xFF,0x10,0, 0xFF,0x08,0, 0xFF,0x00,0}; // RGBA 32bpp
 

-// FIXME_MGL -- these formats will probably have to go into another place,
-//              where wxApp could use them to initialize g_displayDC
+static pixel_format_t gs_pixel_format_wxImage =
+       {0xFF,0x00,0, 0xFF,0x08,0, 0xFF,0x10,0, 0x00,0x00,0}; // RGB 24bpp for wxImage
+
+//-----------------------------------------------------------------------------
+// helpers
+//-----------------------------------------------------------------------------
+
+// Convert wxColour into it's quantized value in lower-precision
+// pixel format (needed for masking by colour).
+static wxColour wxQuantizeColour(const wxColour& clr, const wxBitmap& bmp)
+{
+    pixel_format_t *pf = bmp.GetMGLbitmap_t()->pf;
+    
+    if ( pf->redAdjust == 0 && pf->greenAdjust == 0 && pf->blueAdjust == 0 )
+        return clr;
+    else
+        return wxColour((clr.Red() >> pf->redAdjust) << pf->redAdjust,
+                        (clr.Green() >> pf->greenAdjust) << pf->greenAdjust,
+                        (clr.Blue() >> pf->blueAdjust) << pf->blueAdjust);
+}
+

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


@@ -90,11 +109,14 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     delete m_bitmap;
     m_bitmap = NULL;
 {
     delete m_bitmap;
     m_bitmap = NULL;

+    
+    wxColour clr(wxQuantizeColour(colour, bitmap));

 
 

-    wxImage image = bitmap.ConvertToImage().ConvertToMono(
-                                colour.Red(), colour.Green(), colour.Blue());
+    wxImage imgSrc(bitmap.ConvertToImage());
+    imgSrc.SetMask(FALSE);
+    wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue()));

     if ( !image.Ok() ) return FALSE;
     if ( !image.Ok() ) return FALSE;

-    
+

     m_bitmap = new wxBitmap(image, 1);
 
     return m_bitmap->Ok();
     m_bitmap = new wxBitmap(image, 1);
 
     return m_bitmap->Ok();


@@ -279,7 +301,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
 
     if ( !Create(width, height, depth) ) return;
     
 
     if ( !Create(width, height, depth) ) return;
     

-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_24,
+    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,

                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 
                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 


@@ -306,14 +328,14 @@ wxImage wxBitmap::ConvertToImage() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 

-    long width, height;
+    int width, height;

     width = GetWidth();
     height = GetHeight();
     
     wxImage image(width, height);
     wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
     
     width = GetWidth();
     height = GetHeight();
     
     wxImage image(width, height);
     wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
     

-    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_24,
+    MGLMemoryDC idc(width, height, 24, &gs_pixel_format_wxImage,

                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 
                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 


@@ -517,6 +539,7 @@ MGLDevCtx *wxBitmap::CreateTmpDC() const
             case  4: cnt = 16;  break;
             case  8: cnt = 256; break;
             default:
             case  4: cnt = 16;  break;
             case  8: cnt = 256; break;
             default:

+                cnt = 0;

                 wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
                 break;
         }
                 wxFAIL_MSG( wxT("bitmap with this depth cannot have palette") );
                 break;
         }