From e3d21fc8c65d586c4ecbf2c73faef6a8f97ef60f Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@windows.microsoft.com>
Date: Wed, 19 Aug 2015 18:00:26 -0700
Subject: [PATCH] Fixed problems with WIC1 codepaths

---
 DirectXTex/DirectXTexMipmaps.cpp | 2 ++
 DirectXTex/DirectXTexUtil.cpp    | 2 +-
 DirectXTex/DirectXTexWIC.cpp     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp
index 3102320..0f9e7b3 100644
--- a/DirectXTex/DirectXTexMipmaps.cpp
+++ b/DirectXTex/DirectXTexMipmaps.cpp
@@ -219,6 +219,8 @@ HRESULT _ResizeSeparateColorAndAlpha( _In_ IWICImagingFactory* pWIC, _In_ bool i
                     colorPixelFormat = GUID_WICPixelFormat96bppRGBFloat;
                 }
                 else
+#else
+                UNREFERENCED_PARAMETER(iswic2);
 #endif
                 {
                     colorBytesInPixel = 12;
diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp
index e238243..dc3077b 100644
--- a/DirectXTex/DirectXTexUtil.cpp
+++ b/DirectXTex/DirectXTexUtil.cpp
@@ -275,7 +275,7 @@ IWICImagingFactory* GetWICFactory(bool& iswic2)
         nullptr,
         CLSCTX_INPROC_SERVER,
         __uuidof(IWICImagingFactory),
-        (LPVOID*)&s_Factory
+        (LPVOID*)&g_Factory
         );
 
     g_WIC2 = false;
diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp
index 00f7613..ce0c4db 100644
--- a/DirectXTex/DirectXTexWIC.cpp
+++ b/DirectXTex/DirectXTexWIC.cpp
@@ -161,6 +161,8 @@ static DXGI_FORMAT _DetermineFormat( _In_ const WICPixelFormatGUID& pixelFormat,
                 format = DXGI_FORMAT_R32G32B32_FLOAT;
             }
             else
+#else
+            UNREFERENCED_PARAMETER(iswic2);
 #endif
             {
                 if ( pConvert )