GLKTexture load files without assuming it's PNG (#2106)

* GLKTexture load files without assuming it's PNG

* update others

*  intro of a new function

* update name

Author: Ram

Frameworks/CoreGraphics/CGImage.mm

@@ -225,7 +225,7 @@ inline WICPixelFormatGUID PixelFormat() const {
     }
 
     ~__CGImage() {
-        for (auto listener: _imageDestructionListeners) {
+        for (auto listener : _imageDestructionListeners) {
             listener(this);
         }
     }
@@ -366,7 +366,9 @@ CGDataProviderRef CGImageGetDataProvider(CGImageRef img) {
     RETURN_NULL_IF_FAILED(img->ImageSource()->CopyPixels(nullptr, stride, size, buffer.get()));
 
     CGDataProviderRef dataProvider =
-        CGDataProviderCreateWithData(nullptr, buffer.release(), size, [](void* info, const void* data, size_t size) { IwFree(const_cast<void*>(data)); });
+        CGDataProviderCreateWithData(nullptr, buffer.release(), size, [](void* info, const void* data, size_t size) {
+            IwFree(const_cast<void*>(data));
+        });
     CFAutorelease(dataProvider);
     return dataProvider;
 }
@@ -650,6 +652,12 @@ CGImageRef _CGImageCreateCopyWithPixelFormat(CGImageRef image, WICPixelFormatGUI
     return imageRef;
 }
 
+CGImageRef _CGImageCreateFromDataProvider(CGDataProviderRef provider) {
+    RETURN_NULL_IF(!provider);
+    unsigned char* dataBytes = static_cast<unsigned char*>(const_cast<void*>(_CGDataProviderGetData(provider)));
+    return _CGImageGetImageFromData(dataBytes, _CGDataProviderGetSize(provider));
+}
+
 CGImageRef _CGImageGetImageFromData(void* data, int length) {
     return _CGImageLoadImageWithWICDecoder(GUID_NULL, data, length);
 }
@@ -753,7 +761,6 @@ size_t _CGImageImputeBitsPerPixelFromFormat(CGColorSpaceRef colorSpace, size_t b
 
 HRESULT _CGImageGetWICPixelFormatFromImageProperties(
     unsigned int bitsPerComponent, unsigned int bitsPerPixel, CGColorSpaceRef colorSpace, CGBitmapInfo bitmapInfo, GUID* pixelFormat) {
-
     // clang-format off
     static std::map<uint32_t, WICPixelFormatGUID> s_CGWICFormatMap{
         { CG_FORMAT_KEY(kCGColorSpaceModelRGB       , 24, kCGBitmapByteOrderDefault,  kCGImageAlphaNone),               GUID_WICPixelFormat24bppRGB       },

Frameworks/GLKit/GLKTexture.mm

@@ -1,6 +1,6 @@
 //******************************************************************************
 //
-// Copyright (c) 2015 Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft. All rights reserved.
 //
 // This code is licensed under the MIT License (MIT).
 //
@@ -25,6 +25,7 @@
 #import <GLKit/GLKitExport.h>
 #import <GLKit/GLKTexture.h>
 #import "NSLogging.h"
+#import "CGImageInternal.h"
 
 static const wchar_t* TAG = L"GLKTexture";
 
@@ -277,7 +278,7 @@ @implementation GLKTextureLoader {
 */
 + (GLKTextureInfo*)textureWithContentsOfFile:(NSString*)fname options:(NSDictionary*)opts error:(NSError**)err {
     CGDataProviderRef provider = CGDataProviderCreateWithFilename([fname UTF8String]);
-    CGImageRef img = CGImageCreateWithPNGDataProvider(provider, NULL, NO, kCGRenderingIntentDefault);
+    CGImageRef img = _CGImageCreateFromDataProvider(provider);
 
     GLKTextureInfo* res = [self textureWithCGImage:img options:opts error:err];
 
@@ -395,7 +396,8 @@ + (GLKTextureInfo*)cubeMapWithContentsOfFile:(NSString*)fname options:(NSDiction
     if (!provider) {
         return nil;
     }
-    CGImageRef img = CGImageCreateWithPNGDataProvider(provider, NULL, NO, kCGRenderingIntentDefault);
+
+    CGImageRef img = _CGImageCreateFromDataProvider(provider);
     if (!img) {
         CGDataProviderRelease(provider);
         return nil;
@@ -541,7 +543,8 @@ + (GLKTextureInfo*)cubeMapWithContentsOfFiles:(NSArray*)fnames options:(NSDictio
             curSide++;
             continue;
         }
-        CGImageRef img = CGImageCreateWithPNGDataProvider(provider, NULL, NO, kCGRenderingIntentDefault);
+
+        CGImageRef img = _CGImageCreateFromDataProvider(provider);
         if (!img) {
             CGDataProviderRelease(provider);
             NSTraceWarning(TAG, @"Unable to create image from cube side texture %@", fn);

Frameworks/include/CGImageInternal.h

@@ -49,11 +49,13 @@ struct GuidPixelLess : public std::binary_function<GUID, GUID, bool> {
     }
 };
 
-static const std::map<GUID, int, GuidPixelLess> s_ValidRenderTargetPixelFormat = { { GUID_WICPixelFormat8bppAlpha, 1 },    // A8 Straight
-                                                                                   { GUID_WICPixelFormat32bppRGB, 1 },     // RGBX
-                                                                                   { GUID_WICPixelFormat32bppPRGBA, 1 },   // RGBA Premultiplied
-                                                                                   { GUID_WICPixelFormat32bppBGR, 1 },     // BGRX
-                                                                                   { GUID_WICPixelFormat32bppPBGRA, 1 } }; // BGRX Premultiplied
+static const std::map<GUID, int, GuidPixelLess> s_ValidRenderTargetPixelFormat = { { GUID_WICPixelFormat8bppAlpha, 1 }, // A8 Straight
+                                                                                   { GUID_WICPixelFormat32bppRGB, 1 }, // RGBX
+                                                                                   { GUID_WICPixelFormat32bppPRGBA,
+                                                                                     1 }, // RGBA Premultiplied
+                                                                                   { GUID_WICPixelFormat32bppBGR, 1 }, // BGRX
+                                                                                   { GUID_WICPixelFormat32bppPBGRA,
+                                                                                     1 } }; // BGRX Premultiplied
 
 static const std::map<GUID, __CGImagePixelProperties, GuidPixelLess> s_PixelFormats = {
     // RGB(A) formats
@@ -189,15 +191,14 @@ COREGRAPHICS_EXPORT HRESULT _CGImageGetWICImageSource(CGImageRef image, IWICBitm
 // Obtain a direct pointer to the data.
 COREGRAPHICS_EXPORT void* _CGImageGetRawBytes(CGImageRef image);
 
+COREGRAPHICS_EXPORT CGImageRef _CGImageCreateFromDataProvider(CGDataProviderRef provider);
+
 // Obtain the associated DisplayTexture
 __declspec(dllexport) std::shared_ptr<IDisplayTexture> _CGImageGetDisplayTexture(CGImageRef image);
 
 size_t _CGImageImputeBitsPerPixelFromFormat(CGColorSpaceRef colorSpace, size_t bitsPerComponent, CGBitmapInfo bitmapInfo);
-HRESULT _CGImageGetWICPixelFormatFromImageProperties(unsigned int bitsPerComponent,
-                                                     unsigned int bitsPerPixel,
-                                                     CGColorSpaceRef colorSpace,
-                                                     CGBitmapInfo bitmapInfo,
-                                                     GUID* pixelFormat);
+HRESULT _CGImageGetWICPixelFormatFromImageProperties(
+    unsigned int bitsPerComponent, unsigned int bitsPerPixel, CGColorSpaceRef colorSpace, CGBitmapInfo bitmapInfo, GUID* pixelFormat);
 
 // If the image is of the same format, the image is retained and returned.
 COREGRAPHICS_EXPORT CGImageRef _CGImageCreateCopyWithPixelFormat(CGImageRef image, WICPixelFormatGUID pixelFormat);

build/CoreGraphics/dll/CoreGraphics.def

@@ -381,6 +381,7 @@ LIBRARY CoreGraphics
         ; CGImage private exports
         _CGImageLoadImageWithWICDecoder
         _CGImageGetImageFromData
+        _CGImageCreateFromDataProvider
         _CGImagePNGRepresentation
         _CGImageJPEGRepresentation
         _CGImageRepresentation