From 3800d79e3d5491340e22cbf237ec4b62b75545a2 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 1 Apr 2018 11:32:52 -0700
Subject: Some updates to texture loading routines. Fixed
 https://github.com/DiligentGraphics/DiligentTools/issues/3

---
 TextureLoader/src/Image.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'TextureLoader/src/Image.cpp')

diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index a260678..b2c7ab9 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -395,14 +395,11 @@ namespace Diligent
     }
 
     Image::Image( IReferenceCounters *pRefCounters,
-                  IFileStream *pSrcFile, 
+                  IDataBlob *pFileData,
                   const ImageLoadInfo& LoadInfo ) : 
         TBase(pRefCounters),
         m_pData( MakeNewRCObj<DataBlobImpl>()(0) )
     {
-        RefCntAutoPtr<IDataBlob> pFileData( MakeNewRCObj<DataBlobImpl>()(0) );
-        pSrcFile->Read(pFileData);
-
         if( LoadInfo.Format == EImageFileFormat::tiff )
         {
             LoadTiffFile(pFileData, LoadInfo );
@@ -416,4 +413,12 @@ namespace Diligent
             LoadJpegFile(pFileData, LoadInfo );
         }
     }
+
+    void Image::CreateFromDataBlob(IDataBlob *pFileData,
+                                   const ImageLoadInfo& LoadInfo,
+                                   Image **ppImage)
+    {
+        *ppImage = MakeNewRCObj<Image>()(pFileData, LoadInfo);
+        (*ppImage)->AddRef();
+    }
 }
-- 
cgit v1.2.3