Added WIC_LOADER_SRGB_DEFAULT flag to WICTextureLoader

microsoft · Jun 2, 2020 · bdad044 · bdad044
1 parent acb8938
commit bdad044
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Inc/WICTextureLoader.h b/Inc/WICTextureLoader.h
@@ -41,9 +41,10 @@ namespace DirectX
         WIC_LOADER_DEFAULT      = 0,
         WIC_LOADER_FORCE_SRGB   = 0x1,
         WIC_LOADER_IGNORE_SRGB  = 0x2,
-        WIC_LOADER_FORCE_RGBA32 = 0x10,
+        WIC_LOADER_SRGB_DEFAULT = 0x4,
         WIC_LOADER_FIT_POW2     = 0x20,
         WIC_LOADER_MAKE_SQUARE  = 0x40,
+        WIC_LOADER_FORCE_RGBA32 = 0x80,
     };
 
     // Standard version

diff --git a/Src/WICTextureLoader.cpp b/Src/WICTextureLoader.cpp
@@ -467,6 +467,10 @@ namespace
                         {
                             sRGB = (value.uintVal == 45455);
                         }
+                        else
+                        {
+                            sRGB = (loadFlags & WIC_LOADER_SRGB_DEFAULT) != 0;
+                        }
                     }
 #if defined(_XBOX_ONE) && defined(_TITLE)
                     else if (memcmp(&containerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)) == 0)
@@ -475,19 +479,31 @@ namespace
                         {
                             sRGB = (value.uiVal == 1);
                         }
+                        else
+                        {
+                            sRGB = (loadFlags & WIC_LOADER_SRGB_DEFAULT) != 0;
+                        }
                     }
                     else if (memcmp(&containerFormat, &GUID_ContainerFormatTiff, sizeof(GUID)) == 0)
                     {
                         if (SUCCEEDED(metareader->GetMetadataByName(L"/ifd/exif/{ushort=40961}", &value)) && value.vt == VT_UI2)
                         {
                             sRGB = (value.uiVal == 1);
                         }
+                        else
+                        {
+                            sRGB = (loadFlags & WIC_LOADER_SRGB_DEFAULT) != 0;
+                        }
                     }
 #else
                     else if (SUCCEEDED(metareader->GetMetadataByName(L"System.Image.ColorSpace", &value)) && value.vt == VT_UI2)
                     {
                         sRGB = (value.uiVal == 1);
                     }
+                    else
+                    {
+                        sRGB = (loadFlags & WIC_LOADER_SRGB_DEFAULT) != 0;
+                    }
 #endif
 
                     (void)PropVariantClear(&value);