From bf7160a83e10d34d8e9e78f6e6f54bfbf92ee538 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 22 Oct 2008 16:58:51 +0000 Subject: [PATCH] Ticket #10108 (bitmap from wxImage depth regression) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/bitmap.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 38a27a4092..307c67bada 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -842,14 +842,16 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc) return false; const bool hasAlpha = image.HasAlpha(); + + if (depth == -1) + depth = dib.GetDepth(); // store the bitmap parameters wxBitmapRefData * const refData = new wxBitmapRefData; refData->m_width = w; refData->m_height = h; refData->m_hasAlpha = hasAlpha; - refData->m_depth = depth == -1 ? (hasAlpha ? 32 : 24) - : depth; + refData->m_depth = depth; m_refData = refData; -- 2.45.2