Adapting the WIC factory creator to follow the outlined format in D2D…

…Wrapper (#1357)
microsoft · Nov 11, 2016 · bf9ab26 · bf9ab26
1 parent 6d4e9d0
commit bf9ab26
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/Frameworks/CoreGraphics/CGImage.mm b/Frameworks/CoreGraphics/CGImage.mm
@@ -74,7 +74,8 @@ CGImageRef CGImageCreate(size_t width,
     unsigned char* data = (unsigned char*)[dataProvider bytes];
 
     ComPtr<IWICBitmap> image;
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
 
     REFGUID pixelFormat = _CGImageGetWICPixelFormatFromImageProperties(bitsPerComponent, bitsPerPixel, colorSpace, bitmapInfo);
 
@@ -93,7 +94,9 @@ CGImageRef CGImageCreate(size_t width,
 CGImageRef CGImageCreateWithImageInRect(CGImageRef ref, CGRect rect) {
     RETURN_NULL_IF(!ref);
 
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
+
     ComPtr<IWICBitmap> rectImage;
     RETURN_NULL_IF_FAILED(imageFactory->CreateBitmapFromSourceRect(
         ref->ImageSource().Get(), rect.origin.x, rect.origin.y, rect.size.width, rect.size.height, &rectImage));
@@ -113,7 +116,9 @@ CGImageRef CGImageCreateWithImageInRect(CGImageRef ref, CGRect rect) {
 CGImageRef CGImageCreateCopy(CGImageRef ref) {
     RETURN_NULL_IF(!ref);
 
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
+
     ComPtr<IWICBitmap> image;
 
     RETURN_NULL_IF_FAILED(imageFactory->CreateBitmapFromSource(ref->ImageSource().Get(), WICBitmapCacheOnDemand, &image));
@@ -147,7 +152,8 @@ CGImageRef CGImageMaskCreate(size_t width,
     unsigned char* data = (unsigned char*)[dataProvider bytes];
 
     ComPtr<IWICBitmap> image;
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
 
     woc::unique_cf<CGColorSpaceRef> colorSpace(CGColorSpaceCreateDeviceGray());
     REFGUID pixelFormat =
@@ -408,7 +414,9 @@ CGImageRef _CGImageCreateCopyWithPixelFormat(CGImageRef image, WICPixelFormatGUI
         return image;
     }
 
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
+
     ComPtr<IWICFormatConverter> converter;
     RETURN_NULL_IF_FAILED(imageFactory->CreateFormatConverter(&converter));
 
@@ -449,7 +457,8 @@ CGImageRef _CGImageLoadJPEG(void* bytes, int length) {
 }
 
 CGImageRef _CGImageLoadImageWithWICDecoder(REFGUID decoderCls, void* bytes, int length) {
-    ComPtr<IWICImagingFactory> imageFactory = _GetWICFactory();
+    ComPtr<IWICImagingFactory> imageFactory;
+    RETURN_NULL_IF_FAILED(_CGGetWICFactory(&imageFactory));
 
     ComPtr<IWICBitmapDecoder> pDecoder;
     ComPtr<IWICStream> spStream;

diff --git a/Frameworks/CoreGraphics/D2DWrapper.mm b/Frameworks/CoreGraphics/D2DWrapper.mm
@@ -27,13 +27,9 @@ HRESULT _CGGetD2DFactory(ID2D1Factory** factory) {
     RETURN_HR(sHr);
 }
 
-static ComPtr<IWICImagingFactory> __createWICFactory() {
-    ComPtr<IWICImagingFactory> wicFactory;
-    FAIL_FAST_IF_FAILED(CoCreateInstance(CLSID_WICImagingFactory, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&wicFactory)));
-    return wicFactory;
-}
-
-ComPtr<IWICImagingFactory> _GetWICFactory() {
-    static ComPtr<IWICImagingFactory> s_WICFactory = __createWICFactory();
-    return s_WICFactory;
+HRESULT _CGGetWICFactory(IWICImagingFactory** factory) {
+    static ComPtr<IWICImagingFactory> sWicFactory;
+    static HRESULT sHr = CoCreateInstance(CLSID_WICImagingFactory, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&sWicFactory));
+    sWicFactory.CopyTo(factory);
+    RETURN_HR(sHr);
 }
diff --git a/Frameworks/include/CoreGraphics/D2DWrapper.h b/Frameworks/include/CoreGraphics/D2DWrapper.h
@@ -27,7 +27,7 @@
 
 HRESULT _CGGetD2DFactory(ID2D1Factory** factory);
 
-Microsoft::WRL::ComPtr<IWICImagingFactory> _GetWICFactory();
+HRESULT _CGGetWICFactory(IWICImagingFactory** factory);
 
 inline D2D_POINT_2F _CGPointToD2D_F(CGPoint point) {
     return { point.x, point.y };