Updated cmake files; fixed build warnings

2 files changed, 4 insertions, 6 deletions

diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index 2cf0dbe..babc6c5 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -215,8 +215,7 @@ namespace Diligent
         m_Desc.NumComponents = png_get_channels(png, info);
         auto bit_depth  = png_get_bit_depth(png, info);
         m_Desc.BitsPerPixel = bit_depth * m_Desc.NumComponents;
-        auto color_type = png_get_color_type(png, info);
-
+        
         // PNG files store 16-bit pixels in network byte order (big-endian, ie 
         // most significant bytes first). png_set_swap() shall switch the byte-order 
         // to little-endian (ie, least significant bits first).
@@ -224,6 +223,7 @@ namespace Diligent
             png_set_swap(png);
 
 #if 0
+        auto color_type = png_get_color_type(png, info);
         // Read any color_type into 8bit depth, RGBA format.
         // See http://www.libpng.org/pub/png/libpng-manual.txt
 
diff --git a/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp
index 3bd8442..059e60b 100644
--- a/TextureLoader/src/TextureUtilities.cpp
+++ b/TextureLoader/src/TextureUtilities.cpp
@@ -29,7 +29,7 @@
 #include "BasicFileStream.h"
 #include "RefCntAutoPtr.h"
 #include "DataBlobImpl.h"
-#include <algorithm>
+#include "StringTools.h"
 
 using namespace Diligent;
 
@@ -50,9 +50,7 @@ void CreateImageFromFile( const Diligent::Char *FilePath,
         if (*pExtension == 0)
             LOG_ERROR_AND_THROW("File path \"", FilePath, "\" contains empty extension");
 
-        String Extension(pExtension);
-        std::transform(Extension.begin(), Extension.end(), Extension.begin(), ::tolower);
-
+        String Extension = StrToLower(pExtension);
         RefCntAutoPtr<BasicFileStream> pFileStream(MakeNewRCObj<BasicFileStream>()(FilePath, EFileAccessMode::Read));
         if(!pFileStream->IsValid())
             LOG_ERROR_AND_THROW("Failed to open image file \"", FilePath, '\"');