From f589ed9931f49ab02e853a8abab215778e218a9b Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Thu, 27 Jun 2019 09:12:22 -0700
Subject: Minor updates to image loading functions

---
 TextureLoader/interface/Image.h            | 18 +++++++++++++++---
 TextureLoader/interface/TextureUtilities.h | 12 ------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'TextureLoader/interface')

diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
index a970d77..7b88c83 100644
--- a/TextureLoader/interface/Image.h
+++ b/TextureLoader/interface/Image.h
@@ -94,9 +94,9 @@ public:
     /// \param [in] LoadInfo - Image loading information
     /// \param [out] ppImage - Memory location where pointer to the created image is written.
     ///                        The image should be released via Release().
-    static void CreateFromDataBlob(IDataBlob *pFileData,
-                                    const ImageLoadInfo& LoadInfo,
-                                    Image **ppImage);
+    static void CreateFromDataBlob(IDataBlob*           pFileData,
+                                   const ImageLoadInfo& LoadInfo,
+                                   Image**              ppImage);
 
     struct EncodeInfo
     {
@@ -143,4 +143,16 @@ private:
     RefCntAutoPtr<IDataBlob> m_pData;
 };
 
+
+/// Creates an image from file
+
+/// \param [in] FilePath   - Source file path
+/// \param [out] ppImage   - Memory location where pointer to the created image will be stored
+/// \param [out] ppRawData - If the file format is not recognized by the function, it will load raw bytes
+///                          and return them in the data blob. This parameter can be null.
+/// \return                  Image file format.
+EImageFileFormat CreateImageFromFile(const Char*  FilePath, 
+                                     Image**      ppImage,
+                                     IDataBlob**  ppRawData = nullptr);
+
 }
diff --git a/TextureLoader/interface/TextureUtilities.h b/TextureLoader/interface/TextureUtilities.h
index 73ba1e0..1411d29 100644
--- a/TextureLoader/interface/TextureUtilities.h
+++ b/TextureLoader/interface/TextureUtilities.h
@@ -34,18 +34,6 @@
 namespace Diligent
 {
 
-/// Creates an image from file
-
-/// \param [in] FilePath   - Source file path
-/// \param [out] ppImage   - Memory location where pointer to the created image will be stored
-/// \param [out] ppRawData - If the file format is not recognized by the function, it will load raw bytes
-///                          and return them in the data blob. This parameter can be null.
-/// \return                  Image file format.
-EImageFileFormat CreateImageFromFile(const Char*  FilePath, 
-                                     Image**      ppImage,
-                                     IDataBlob**  ppRawData = nullptr);
-
-
 /// Creates a texture from file
 
 /// \param [in] FilePath - Source file path
-- 
cgit v1.2.3