interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed image drawing. Still need to figure out why it's using the wrong size...

This commit is contained in:
Pietro Gagliardi 2018-06-16 04:26:36 -04:00
parent f852359acb
commit f1341a0485
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
windows/image.cpp
View File

@ -147,6 +147,8 @@ HRESULT uiprivWICToGDI(IWICBitmap *b, HDC dc, int width, int height, HBITMAP *hb
src = b; src = b;
} else { } else {
IWICBitmapScaler *scaler; IWICBitmapScaler *scaler;
WICPixelFormatGUID guid;
IWICFormatConverter *conv;
hr = uiprivWICFactory->CreateBitmapScaler(&scaler); hr = uiprivWICFactory->CreateBitmapScaler(&scaler);
if (hr != S_OK) if (hr != S_OK)
@ -158,7 +160,35 @@ HRESULT uiprivWICToGDI(IWICBitmap *b, HDC dc, int width, int height, HBITMAP *hb
scaler->Release(); scaler->Release();
return hr; return hr;
} }
src = scaler;
// But we are not done yet! IWICBitmapScaler can use an
// entirely different pixel format than what we gave it,
// and by extension, what GDI wants. See also:
// - https://stackoverflow.com/questions/28323228/iwicbitmapscaler-doesnt-work-for-96bpprgbfloat-format
// - https://github.com/Microsoft/DirectXTex/blob/0d94e9469bc3e6080a71145f35efa559f8f2e522/DirectXTex/DirectXTexResize.cpp#L83
hr = scaler->GetPixelFormat(&guid);
if (hr != S_OK) {
scaler->Release();
return hr;
}
if (IsEqualGUID(guid, GUID_WICPixelFormat32bppRGBA))
src = scaler;
else {
hr = uiprivWICFactory->CreateFormatConverter(&conv);
if (hr != S_OK) {
scaler->Release();
return hr;
}
hr = conv->Initialize(scaler, GUID_WICPixelFormat32bppRGBA,
// TODO is the dither type correct in all cases?
WICBitmapDitherTypeNone, NULL, 0, WICBitmapPaletteTypeMedianCut);
scaler->Release();
if (hr != S_OK) {
conv->Release();
return hr;
}
src = conv;
}
} }
ZeroMemory(&bmi, sizeof (BITMAPINFO)); ZeroMemory(&bmi, sizeof (BITMAPINFO));
@ -181,10 +211,9 @@ HRESULT uiprivWICToGDI(IWICBitmap *b, HDC dc, int width, int height, HBITMAP *hb
// TODO fill in the error returns here too // TODO fill in the error returns here too
if (GetObject(*hb, sizeof (BITMAP), &bmp) == 0) if (GetObject(*hb, sizeof (BITMAP), &bmp) == 0)
logLastError(L"error calling GetObject() in uiprivWICToGDI()"); logLastError(L"error calling GetObject() in uiprivWICToGDI()");
hr = b->CopyPixels(NULL, bmp.bmWidthBytes, hr = src->CopyPixels(NULL, bmp.bmWidthBytes,
bmp.bmWidthBytes * bmp.bmHeight, (BYTE *) bits); bmp.bmWidthBytes * bmp.bmHeight, (BYTE *) bits);
hr = S_OK;
fail: fail:
if (*hb != NULL && hr != S_OK) { if (*hb != NULL && hr != S_OK) {
// don't bother with the error returned here // don't bother with the error returned here