#pragma hdrstop
#endif
+#if wxUSE_WXDIB
+
#ifndef WX_PRECOMP
#include "wx/string.h"
#include "wx/log.h"
+ #include "wx/intl.h"
+ #include "wx/bitmap.h"
+ #include "wx/image.h"
#endif //WX_PRECOMP
-#if wxUSE_WXDIB
-
-#include "wx/bitmap.h"
-#include "wx/intl.h"
#include "wx/file.h"
#include <stdio.h>
#include <stdlib.h>
-#if !defined(__MWERKS__) && !defined(__SALFORDC__)
+#if !defined(__MWERKS__)
#include <memory.h>
#endif
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#include "wx/image.h"
#include "wx/msw/dib.h"
#ifdef __WXWINCE__
{
// 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
{
wxCHECK_MSG( bmp.Ok(), false, _T("wxDIB::Create(): invalid bitmap") );
+ if ( !Create(GetHbitmapOf(bmp)) )
+ return false;
+
+ m_hasAlpha = bmp.HasAlpha();
+
+ return true;
+}
+
+bool wxDIB::Create(HBITMAP hbmp)
+{
// this bitmap could already be a DIB section in which case we don't need
// to convert it to DIB
- HBITMAP hbmp = GetHbitmapOf(bmp);
-
DIBSECTION ds;
if ( GetDIBSection(hbmp, &ds) )
{
}
else // no, it's a DDB -- convert it to DIB
{
- const int w = bmp.GetWidth();
- const int h = bmp.GetHeight();
- int d = bmp.GetDepth();
+ // prepare all the info we need
+ BITMAP bm;
+ if ( !::GetObject(hbmp, sizeof(bm), &bm) )
+ {
+ wxLogLastError(wxT("GetObject(bitmap)"));
+
+ return false;
+ }
+
+ int d = bm.bmBitsPixel;
if ( d <= 0 )
d = wxDisplayDepth();
- if ( !Create(w, h, d) || !CopyFromDDB(hbmp) )
+ if ( !Create(bm.bmWidth, bm.bmHeight, d) || !CopyFromDDB(hbmp) )
return false;
}
m_handle = (HBITMAP)::LoadImage
(
wxGetInstance(),
- filename,
+ filename.fn_str(),
IMAGE_BITMAP,
0, 0, // don't specify the size
LR_CREATEDIBSECTION | LR_LOADFROMFILE
{
wxCHECK_MSG( m_handle, false, _T("wxDIB::Save(): invalid object") );
+#if wxUSE_FILE
wxFile file(filename, wxFile::write);
bool ok = file.IsOpened();
if ( ok )
file.Write(ds.dsBm.bmBits, sizeImage) == sizeImage;
}
}
+#else // !wxUSE_FILE
+ bool ok = false;
+#endif // wxUSE_FILE/!wxUSE_FILE
if ( !ok )
{
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 */
return NULL;
}
- if ( !ConvertFromBitmap((BITMAPINFO *)(void *)GlobalPtr(hDIB), hbmp) )
+ if ( !ConvertFromBitmap((BITMAPINFO *)(void *)GlobalPtrLock(hDIB), hbmp) )
{
// this really shouldn't happen... it worked the first time, why not
// now?
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 selectHandle(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
// if we have alpha channel, we need to create a 32bpp RGBA DIB, otherwise
// a 24bpp RGB is sufficient
- const bool hasAlpha = image.HasAlpha();
- const int bpp = hasAlpha ? 32 : 24;
+ m_hasAlpha = image.HasAlpha();
+ const int bpp = m_hasAlpha ? 32 : 24;
if ( !Create(w, h, bpp) )
return false;
const int srcBytesPerLine = w * 3;
const int dstBytesPerLine = GetLineSize(w, bpp);
const unsigned char *src = image.GetData() + ((h - 1) * srcBytesPerLine);
- const unsigned char *alpha = hasAlpha ? image.GetAlpha() + (h - 1)*w : NULL;
+ const unsigned char *alpha = m_hasAlpha ? image.GetAlpha() + (h - 1)*w
+ : NULL;
unsigned char *dstLineStart = (unsigned char *)m_data;
for ( int y = 0; y < h; y++ )
{
// copy one DIB line
unsigned char *dst = dstLineStart;
- for ( int x = 0; x < w; x++ )
+ if ( alpha )
{
- // also, the order of RGB is inversed for DIBs
- *dst++ = src[2];
- *dst++ = src[1];
- *dst++ = src[0];
-
- src += 3;
-
- if ( alpha )
- *dst++ = *alpha++;
+ for ( int x = 0; x < w; x++ )
+ {
+ // RGB order is reversed, and we need to premultiply
+ // all channels by alpha value for use with ::AlphaBlend.
+ const unsigned char a = *alpha++;
+ *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;
+ }
+ }
+ else // no alpha channel
+ {
+ for ( int x = 0; x < w; x++ )
+ {
+ // RGB order is reversed.
+ *dst++ = src[2];
+ *dst++ = src[1];
+ *dst++ = src[0];
+ src += 3;
+ }
}
// pass to the previous line in the image
return wxNullImage;
}
- const int bpp = GetDepth();
- if ( bpp == 32 )
+ if ( m_hasAlpha )
{
image.SetAlpha();
}
// this is the same loop as in Create() just above but with copy direction
// reversed
+ const int bpp = GetDepth();
const int dstBytesPerLine = w * 3;
const int srcBytesPerLine = GetLineSize(w, bpp);
unsigned char *dst = image.GetData() + ((h - 1) * dstBytesPerLine);
unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() + (h - 1)*w
: NULL;
+ const bool is32bit = bpp == 32;
const unsigned char *srcLineStart = (unsigned char *)GetData();
for ( int y = 0; y < h; y++ )
{
dst[1] = *src++;
dst[0] = *src++;
- dst += 3;
+ if ( is32bit )
+ {
+ if ( alpha )
+ {
+ // wxImage uses non premultiplied alpha so undo
+ // premultiplication done in Create() above
+ const unsigned char a = *src;
+ *alpha++ = a;
+ if ( a > 0 )
+ {
+ dst[0] = (dst[0] * 255) / a;
+ dst[1] = (dst[1] * 255) / a;
+ dst[2] = (dst[2] * 255) / a;
+ }
+ }
- if ( alpha )
- *alpha++ = *src++;
+ src++;
+ }
+
+ dst += 3;
}
// pass to the previous line in the image
#endif // wxUSE_IMAGE
#endif // wxUSE_WXDIB
-
projects / wxWidgets.git / blobdiff