Applied patch [ 1194316 ] wxMediaCtrl MSW config and setup cleanup

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

diff --git a/src/mgl/bitmap.cpp b/src/mgl/bitmap.cpp
index 4e9e1051eb01dbe7faa9f8d32b361186c58a2fc1..b8a3f3906d172c2060adb08f78db91aa91a6c4bc 100644 (file)
--- a/src/mgl/bitmap.cpp
+++ b/src/mgl/bitmap.cpp
@@ -2,11 +2,11 @@
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Name:        bitmap.cpp
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$

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

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bitmap.h"
 #endif
 
 #pragma implementation "bitmap.h"
 #endif
 


@@ -48,6 +48,29 @@ 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
 

+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);
+}
+
+
+

 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------


@@ -86,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();


@@ -165,16 +191,9 @@ wxBitmapRefData::~wxBitmapRefData()
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap,wxBitmapBase)
 

-wxBitmap::wxBitmap()
-{
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-

 wxBitmap::wxBitmap(int width, int height, int depth)
 {
     Create(width, height, depth);
 wxBitmap::wxBitmap(int width, int height, int depth)
 {
     Create(width, height, depth);

-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);

 }
 
 
 }
 
 


@@ -259,12 +278,10 @@ bool wxBitmap::CreateFromXpm(const char **bits)
     
     *this = wxBitmap(img);
     
     
     *this = wxBitmap(img);
     

-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-

     return TRUE;
 }
 
     return TRUE;
 }
 

-wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
+wxBitmap::wxBitmap(const wxImage& image, int depth)

 {
     long width, height;
 
 {
     long width, height;
 


@@ -275,13 +292,13 @@ 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") );
 
     MGLDevCtx *bdc = CreateTmpDC();
 
                     width * 3, (void*)image.GetData(), NULL);
     wxASSERT_MSG( idc.isValid(), wxT("cannot create custom MGLDC") );
 
     MGLDevCtx *bdc = CreateTmpDC();
 

-    if ( depth <= 8 && image.HasPalette() )
+    if ( GetDepth() <= 8 && image.HasPalette() )

         SetPalette(image.GetPalette());
 
     bdc->bitBlt(idc, 0, 0, width, height, 0, 0, MGL_REPLACE_MODE);
         SetPalette(image.GetPalette());
 
     bdc->bitBlt(idc, 0, 0, width, height, 0, 0, MGL_REPLACE_MODE);


@@ -300,7 +317,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth = -1)
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
 wxImage wxBitmap::ConvertToImage() const
 {

-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
+    wxCHECK_MSG( Ok(), wxImage(), wxT("invalid bitmap") );

 
     int width, height;
     width = GetWidth();
 
     int width, height;
     width = GetWidth();


@@ -309,7 +326,7 @@ wxImage wxBitmap::ConvertToImage() const
     wxImage image(width, height);
     wxASSERT_MSG( image.Ok(), wxT("cannot create image") );
     
     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") );
 


@@ -344,15 +361,11 @@ wxImage wxBitmap::ConvertToImage() const
 wxBitmap::wxBitmap(const wxBitmap& bmp)
 {
     Ref(bmp);
 wxBitmap::wxBitmap(const wxBitmap& bmp)
 {
     Ref(bmp);

-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
 {
     LoadFile(filename, type);
 }
 
 wxBitmap::wxBitmap(const wxString &filename, wxBitmapType type)
 {
     LoadFile(filename, type);

-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)


@@ -367,13 +380,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
     bdc->clearDevice();
     bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits);
     delete bdc;
     bdc->clearDevice();
     bdc->putMonoImage(0, 0, width, (width + 7) / 8, height, (void*)bits);
     delete bdc;

-
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
-}
-
-wxBitmap::~wxBitmap()
-{
-    if ( wxTheBitmapList ) wxTheBitmapList->DeleteObject(this);

 }
 
 wxBitmap& wxBitmap::operator = (const wxBitmap& bmp)
 }
 
 wxBitmap& wxBitmap::operator = (const wxBitmap& bmp)


@@ -839,8 +845,8 @@ bool wxPNGBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
             s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
             for (x = 0; x < bmp->width; x++, s ++)
             {
             s = ((wxUint32*)bmp->surface) + y * bmp->bytesPerLine/4;
             for (x = 0; x < bmp->width; x++, s ++)
             {

-                if ( ((((*s) >> bmp->pf->rsvdPos) & bmp->pf->rsvdMask) 
-                        << bmp->pf->rsvdAdjust) < 128 )
+                if ( ((((*s) >> bmp->pf->alphaPos) & bmp->pf->alphaMask) 
+                        << bmp->pf->alphaAdjust) < 128 )

                     *s = 0;
                 else
                     *s = 0x00FFFFFF; // white
                     *s = 0;
                 else
                     *s = 0x00FFFFFF; // white