Bug: can't add user-defined images using .xpm

[jik]

There is a bug in overloaded function RegisterImage(iIndex, pXpm, Name). This function is used if we want to add user-defined image using .xpm file. The Mask is not set. As a result, initAlpha() clears the image. SetMaskColour() should be added before initAlpha():

Code: Select all

void ThemeBase::RegisterImage( int &iIndex, char const ** pXpm, const wxString & Name ) {
   wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice!
   wxImage Img(pXpm);
   Img.SetMaskColour(0xDE, 0xDE, 0xDE); // <-- missed call
   Img.InitAlpha();
   RegisterImage( iIndex, Img, Name );
}

[steve]

Which version are you looking at? That does not appear to quite match the current code: https://github.com/audacity/audacity/bl ... /Theme.cpp

[jik]

line 457 by your github link:

Code: Select all

void ThemeBase::RegisterImage( int &iIndex, char const ** pXpm, const wxString & Name )
{
   wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice!
   wxBitmap Bmp( pXpm ); // a 24 bit bitmap.
   wxImage Img( Bmp.ConvertToImage() );
   Img.SetMaskColour(0xDE, 0xDE, 0xDE); // <-- missed call
   Img.InitAlpha();
   RegisterImage( iIndex, Img, Name );
}

[steve]

I'm not familiar with this part of the code, so all I can do is pass this on to the developer's mailing list, or you can do that yourself if you prefer.

[jik]

Function wxImage::InitAlpha() check the Mask. If there is no Mask it just clears the image:

Code: Select all

    if ( HasMask() )
    {
      ...
    }
    else // no mask
    {
        // make the image fully opaque
        memset(alpha, wxIMAGE_ALPHA_OPAQUE, lenAlpha);
    }

Could you please pass the report on the developer's mailing list?

[steve]

Could you please pass the report on the developer's mailing list?

Sure, will do. Thanks.