gdk_rgb doesn't work on SGI.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -453,7 +453,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
|
|||||||
// We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
|
// We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
|
||||||
// visuals are not supported by GDK so we do these ourselves, too.
|
// visuals are not supported by GDK so we do these ourselves, too.
|
||||||
// 15-bit and 16-bit should actually work and 24-bit certainly does.
|
// 15-bit and 16-bit should actually work and 24-bit certainly does.
|
||||||
|
#ifdef __sgi
|
||||||
|
if (!image.HasMask() && (bpp > 16))
|
||||||
|
#else
|
||||||
if (!image.HasMask() && (bpp > 12))
|
if (!image.HasMask() && (bpp > 12))
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
static bool s_hasInitialized = FALSE;
|
static bool s_hasInitialized = FALSE;
|
||||||
|
|
||||||
|
@@ -453,7 +453,11 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
|
|||||||
// We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
|
// We handle 8-bit bitmaps ourselves using the colour cube, 12-bit
|
||||||
// visuals are not supported by GDK so we do these ourselves, too.
|
// visuals are not supported by GDK so we do these ourselves, too.
|
||||||
// 15-bit and 16-bit should actually work and 24-bit certainly does.
|
// 15-bit and 16-bit should actually work and 24-bit certainly does.
|
||||||
|
#ifdef __sgi
|
||||||
|
if (!image.HasMask() && (bpp > 16))
|
||||||
|
#else
|
||||||
if (!image.HasMask() && (bpp > 12))
|
if (!image.HasMask() && (bpp > 12))
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
static bool s_hasInitialized = FALSE;
|
static bool s_hasInitialized = FALSE;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user