Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use 8 bits for alpha, nothing needs 16 bit alpha here

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-08-28 15:46:32 +00:00
parent 173d02a872
commit 3bbc1d95a1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/colour.cpp
View File

@@ -23,7 +23,7 @@
class wxColourRefData : public wxGDIRefData class wxColourRefData : public wxGDIRefData
{ {
public: public:
wxColourRefData(guint16 red, guint16 green, guint16 blue, guint16 alpha) wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)
{ {
m_color.red = m_color.red =
m_red = red; m_red = red;
@@ -50,7 +50,7 @@ public:
guint16 m_red; guint16 m_red;
guint16 m_green; guint16 m_green;
guint16 m_blue; guint16 m_blue;
guint16 m_alpha; wxByte m_alpha;
DECLARE_NO_COPY_CLASS(wxColourRefData) DECLARE_NO_COPY_CLASS(wxColourRefData)
}; };
@@ -92,7 +92,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
wxColour::wxColour(const GdkColor& gdkColor) wxColour::wxColour(const GdkColor& gdkColor)
{ {
m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue, 0xFFFF /*opaque alpha in 16 bit*/); m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
} }
wxColour::~wxColour() wxColour::~wxColour()
@@ -124,7 +124,7 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl
(guint16(red) << SHIFT) + red, (guint16(red) << SHIFT) + red,
(guint16(green) << SHIFT) + green, (guint16(green) << SHIFT) + green,
(guint16(blue) << SHIFT) + blue, (guint16(blue) << SHIFT) + blue,
(guint16(alpha) << SHIFT) + alpha); alpha);
} }
unsigned char wxColour::Red() const unsigned char wxColour::Red() const
@@ -152,7 +152,7 @@ unsigned char wxColour::Alpha() const
{ {
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
return wxByte(M_COLDATA->m_alpha >> SHIFT); return M_COLDATA->m_alpha;
} }
void wxColour::CalcPixel( GdkColormap *cmap ) void wxColour::CalcPixel( GdkColormap *cmap )