From 5658701f7e3534df8a4a4c0fdc2bd500c60a1b2d Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Tue, 28 Jan 2020 23:29:59 -0800
Subject: Updates to comply with the new API

---
 TextureLoader/include/pch.h            |  4 ++--
 TextureLoader/interface/Image.h        |  4 ++--
 TextureLoader/src/Image.cpp            | 18 +++++++++---------
 TextureLoader/src/KTXLoader.cpp        |  4 ++--
 TextureLoader/src/TextureLoader.cpp    |  2 +-
 TextureLoader/src/TextureUtilities.cpp |  6 +++---
 6 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'TextureLoader')

diff --git a/TextureLoader/include/pch.h b/TextureLoader/include/pch.h
index 13c3f13..35a7fbd 100644
--- a/TextureLoader/include/pch.h
+++ b/TextureLoader/include/pch.h
@@ -30,5 +30,5 @@
 #include "BasicTypes.h"
 #include "RenderDevice.h"
 #include "DeviceContext.h"
-#include "Errors.h"
-#include "DebugUtilities.h"
+#include "Errors.hpp"
+#include "DebugUtilities.hpp"
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
index 6925cae..7a8f11a 100644
--- a/TextureLoader/interface/Image.h
+++ b/TextureLoader/interface/Image.h
@@ -32,8 +32,8 @@
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h"
 #include "../../../DiligentCore/Primitives/interface/FileStream.h"
 #include "../../../DiligentCore/Primitives/interface/DataBlob.h"
-#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.h"
-#include "../../../DiligentCore/Common/interface/ObjectBase.h"
+#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
+#include "../../../DiligentCore/Common/interface/ObjectBase.hpp"
 
 namespace Diligent
 {
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index f2dc7f0..5f0bb0c 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -31,19 +31,19 @@
 #include <array>
 
 #include "Image.h"
-#include "Errors.h"
+#include "Errors.hpp"
 
 #include "tiffio.h"
 #include "png.h"
 #include "jpeglib.h"
 
-#include "DataBlobImpl.h"
-#include "DebugUtilities.h"
-#include "RefCntAutoPtr.h"
-#include "Align.h"
-#include "GraphicsAccessories.h"
-#include "BasicFileStream.h"
-#include "StringTools.h"
+#include "DataBlobImpl.hpp"
+#include "DebugUtilities.hpp"
+#include "RefCntAutoPtr.hpp"
+#include "Align.hpp"
+#include "GraphicsAccessories.hpp"
+#include "BasicFileStream.hpp"
+#include "StringTools.hpp"
 
 namespace Diligent
 {
@@ -770,7 +770,7 @@ EImageFileFormat CreateImageFromFile(const Char* FilePath,
             LOG_ERROR_AND_THROW("Failed to open image file \"", FilePath, '\"');
 
         RefCntAutoPtr<IDataBlob> pFileData(MakeNewRCObj<DataBlobImpl>()(0));
-        pFileStream->Read(pFileData);
+        pFileStream->ReadBlob(pFileData);
 
         ImgFileFormat = Image::GetFileFormat(reinterpret_cast<Uint8*>(pFileData->GetDataPtr()), pFileData->GetSize());
         if (ImgFileFormat == EImageFileFormat::unknown)
diff --git a/TextureLoader/src/KTXLoader.cpp b/TextureLoader/src/KTXLoader.cpp
index 5bf4f74..a747844 100644
--- a/TextureLoader/src/KTXLoader.cpp
+++ b/TextureLoader/src/KTXLoader.cpp
@@ -27,8 +27,8 @@
 
 #include <algorithm>
 #include "TextureLoader.h"
-#include "GraphicsAccessories.h"
-#include "Align.h"
+#include "GraphicsAccessories.hpp"
+#include "Align.hpp"
 
 #define GL_RGBA32F            0x8814
 #define GL_RGBA32UI           0x8D70
diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp
index 530fd6e..9aa8c67 100644
--- a/TextureLoader/src/TextureLoader.cpp
+++ b/TextureLoader/src/TextureLoader.cpp
@@ -32,7 +32,7 @@
 #include <vector>
 
 #include "TextureLoader.h"
-#include "GraphicsAccessories.h"
+#include "GraphicsAccessories.hpp"
 #include "DDSLoader.h"
 #include "ColorConversion.h"
 
diff --git a/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp
index b3ac604..8349c9d 100644
--- a/TextureLoader/src/TextureUtilities.cpp
+++ b/TextureLoader/src/TextureUtilities.cpp
@@ -27,11 +27,11 @@
 
 #include "pch.h"
 #include "TextureUtilities.h"
-#include "Errors.h"
+#include "Errors.hpp"
 #include "TextureLoader.h"
 #include "Image.h"
-#include "RefCntAutoPtr.h"
-#include "DataBlobImpl.h"
+#include "RefCntAutoPtr.hpp"
+#include "DataBlobImpl.hpp"
 
 namespace Diligent
 {
-- 
cgit v1.2.3