diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 07:29:59 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-29 07:29:59 +0000 |
| commit | 5658701f7e3534df8a4a4c0fdc2bd500c60a1b2d (patch) | |
| tree | 7af8927ca496d9a5fbfa1ce6f3ec1ae78ef6844e /TextureLoader/src | |
| parent | ImGuiImplDiligent: added UpdateFontsTexture() method (diff) | |
| download | DiligentTools-5658701f7e3534df8a4a4c0fdc2bd500c60a1b2d.tar.gz DiligentTools-5658701f7e3534df8a4a4c0fdc2bd500c60a1b2d.zip | |
Updates to comply with the new API
Diffstat (limited to 'TextureLoader/src')
| -rw-r--r-- | TextureLoader/src/Image.cpp | 18 | ||||
| -rw-r--r-- | TextureLoader/src/KTXLoader.cpp | 4 | ||||
| -rw-r--r-- | TextureLoader/src/TextureLoader.cpp | 2 | ||||
| -rw-r--r-- | TextureLoader/src/TextureUtilities.cpp | 6 |
4 files changed, 15 insertions, 15 deletions
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 { |