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

Don't use ID2D1Bitmap::GetSize() to get source bitmap size

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/2074

See #17171, #18686.
This commit is contained in:
Maarten Bent
2020-10-04 23:43:19 +02:00
committed by Vadim Zeitlin
parent 633165fd13
commit 5e57976bba
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/graphicsd2d.cpp
View File

@@ -4494,11 +4494,11 @@ void wxD2DContext::DrawBitmap(const wxGraphicsBitmap& bmp, wxDouble x, wxDouble
wxD2DBitmapData* bitmapData = wxGetD2DBitmapData(bmp);
bitmapData->Bind(this);
D2D1_SIZE_F imgSize = bitmapData->GetD2DBitmap()->GetSize();
wxBitmap const& bitmap = static_cast<wxD2DBitmapData::NativeType*>(bitmapData->GetNativeBitmap())->GetSourceBitmap();
m_renderTargetHolder->DrawBitmap(
bitmapData->GetD2DBitmap(),
D2D1::RectF(0, 0, imgSize.width, imgSize.height),
D2D1::RectF(0, 0, bitmap.GetWidth(), bitmap.GetHeight()),
D2D1::RectF(x, y, x + w, y + h),
GetInterpolationQuality(),
GetCompositionMode());