Rebase against 2e754a652725c067bc44445cebe8b96487ec4a6e

This commit is contained in:
Alistair Leslie-Hughes
2018-10-06 19:03:12 +10:00
parent f17ad5a016
commit 2de179532e
3 changed files with 14 additions and 14 deletions

View File

@@ -264,7 +264,7 @@ index 89ec9ea..a8370ff 100644
+ else
+ rgb24_source = source;
+
+ hr = ComponentFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory);
+ hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory);
+ if (hr != S_OK) goto fail;
+
+ hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap);