#include <memory.h>
#endif
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
#include "wx/image.h"
#include "wx/msw/dib.h"
{
// only 1, 4 and 8bpp bitmaps use palettes (well, they could be used with
// 24bpp ones too but we don't support this as I think it's quite uncommon)
- return bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0;
+ return (WORD)(bitsPerPixel <= 8 ? 1 << bitsPerPixel : 0);
}
// wrapper around ::GetObject() for DIB sections
info->bmiHeader.biHeight = height;
info->bmiHeader.biPlanes = 1;
- info->bmiHeader.biBitCount = depth;
+ info->bmiHeader.biBitCount = (WORD)depth;
info->bmiHeader.biSizeImage = GetLineSize(width, depth)*height;
m_handle = ::CreateDIBSection
return 0;
}
- return ConvertToBitmap((BITMAPINFO *)&ds.dsBmih, hdc, ds.dsBm.bmBits);
+ // how many colours are we going to have in the palette?
+ DWORD biClrUsed = ds.dsBmih.biClrUsed;
+ if ( !biClrUsed )
+ {
+ // biClrUsed field might not be set
+ biClrUsed = GetNumberOfColours(ds.dsBmih.biBitCount);
+ }
+
+ if ( !biClrUsed )
+ {
+ return ConvertToBitmap((BITMAPINFO *)&ds.dsBmih, hdc, ds.dsBm.bmBits);
+ }
+ else
+ {
+ // fake a BITMAPINFO w/o bits, just the palette info
+ wxCharBuffer bmi(sizeof(BITMAPINFO) + (biClrUsed - 1)*sizeof(RGBQUAD));
+ BITMAPINFO *pBmi = (BITMAPINFO *)bmi.data();
+ MemoryHDC hDC;
+ // get the colour table
+ SelectInHDC sDC(hDC, m_handle);
+ ::GetDIBColorTable(hDC, 0, biClrUsed, pBmi->bmiColors);
+ memcpy(&pBmi->bmiHeader, &ds.dsBmih, ds.dsBmih.biSize);
+
+ return ConvertToBitmap(pBmi, hdc, ds.dsBm.bmBits);
+ }
}
/* static */
wxPalette *wxDIB::CreatePalette() const
{
+ // GetDIBColorTable not available in eVC3
+#if defined(_WIN32_WCE) && _WIN32_WCE < 400
+ return NULL;
+#else
wxCHECK_MSG( m_handle, NULL, _T("wxDIB::CreatePalette(): invalid object") );
DIBSECTION ds;
return NULL;
}
+ MemoryHDC hDC;
+
// LOGPALETTE struct has only 1 element in palPalEntry array, we're
// going to have biClrUsed of them so add necessary space
LOGPALETTE *pPalette = (LOGPALETTE *)
// initialize the palette header
pPalette->palVersion = 0x300; // magic number, not in docs but works
- pPalette->palNumEntries = biClrUsed;
+ pPalette->palNumEntries = (WORD)biClrUsed;
- // and the colour table (it starts right after the end of the header)
- const RGBQUAD *pRGB = (RGBQUAD *)((char *)&ds.dsBmih + ds.dsBmih.biSize);
+ // and the colour table
+ wxCharBuffer rgb(sizeof(RGBQUAD) * biClrUsed);
+ RGBQUAD *pRGB = (RGBQUAD*)rgb.data();
+ SelectInHDC(hDC, m_handle);
+ ::GetDIBColorTable(hDC, 0, biClrUsed, pRGB);
for ( DWORD i = 0; i < biClrUsed; i++, pRGB++ )
{
pPalette->palPalEntry[i].peRed = pRGB->rgbRed;
palette->SetHPALETTE((WXHPALETTE)hPalette);
return palette;
+#endif
}
#endif // wxUSE_PALETTE
// RGB order is reversed, and we need to premultiply
// all channels by alpha value for use with ::AlphaBlend.
const unsigned char a = *alpha++;
- *dst++ = (src[2] * a + 127) / 255;
- *dst++ = (src[1] * a + 127) / 255;
- *dst++ = (src[0] * a + 127) / 255;
+ *dst++ = (unsigned char)((src[2] * a + 127) / 255);
+ *dst++ = (unsigned char)((src[1] * a + 127) / 255);
+ *dst++ = (unsigned char)((src[0] * a + 127) / 255);
*dst++ = a;
src += 3;
}