diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-06-27 16:12:22 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-06-27 16:12:22 +0000 |
| commit | f589ed9931f49ab02e853a8abab215778e218a9b (patch) | |
| tree | 37c16405a4b00ff0a90d50f2380b3f299cfcdde5 /TextureLoader/interface | |
| parent | Updated readme: added license and contributing sections (diff) | |
| download | DiligentTools-f589ed9931f49ab02e853a8abab215778e218a9b.tar.gz DiligentTools-f589ed9931f49ab02e853a8abab215778e218a9b.zip | |
Minor updates to image loading functions
Diffstat (limited to 'TextureLoader/interface')
| -rw-r--r-- | TextureLoader/interface/Image.h | 18 | ||||
| -rw-r--r-- | TextureLoader/interface/TextureUtilities.h | 12 |
2 files changed, 15 insertions, 15 deletions
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 |
