diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-25 03:19:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-25 03:19:41 +0000 |
| commit | 942fdb82bb026350f1a27856efbc231e89fcada6 (patch) | |
| tree | 3769a22f6e52831d2383f99f328e393404c97e37 /TextureLoader/interface/Image.h | |
| parent | clang-formatted NativeApp (diff) | |
| download | DiligentTools-942fdb82bb026350f1a27856efbc231e89fcada6.tar.gz DiligentTools-942fdb82bb026350f1a27856efbc231e89fcada6.zip | |
clang-formatted TextureLoader project
Diffstat (limited to 'TextureLoader/interface/Image.h')
| -rw-r--r-- | TextureLoader/interface/Image.h | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h index 1ea3e38..641518e 100644 --- a/TextureLoader/interface/Image.h +++ b/TextureLoader/interface/Image.h @@ -100,46 +100,46 @@ public: struct EncodeInfo { - Uint32 Width = 0; - Uint32 Height = 0; - TEXTURE_FORMAT TexFormat = TEX_FORMAT_UNKNOWN; - bool KeepAlpha = false; - const void* pData = nullptr; - Uint32 Stride = 0; - EImageFileFormat FileFormat = EImageFileFormat::jpeg; - int JpegQuality = 95; + Uint32 Width = 0; + Uint32 Height = 0; + TEXTURE_FORMAT TexFormat = TEX_FORMAT_UNKNOWN; + bool KeepAlpha = false; + const void* pData = nullptr; + Uint32 Stride = 0; + EImageFileFormat FileFormat = EImageFileFormat::jpeg; + int JpegQuality = 95; }; static void Encode(const EncodeInfo& Info, IDataBlob** ppEncodedData); /// Returns image description - const ImageDesc& GetDesc(){ return m_Desc; } + const ImageDesc& GetDesc() { return m_Desc; } /// Returns a pointer to the image data - IDataBlob* GetData(){ return m_pData; } - - static std::vector<Uint8> ConvertImageData(Uint32 Width, - Uint32 Height, - const Uint8* pData, - Uint32 Stride, - TEXTURE_FORMAT SrcFormat, - TEXTURE_FORMAT DstFormat, - bool KeepAlpha); - + IDataBlob* GetData() { return m_pData; } + + static std::vector<Uint8> ConvertImageData(Uint32 Width, + Uint32 Height, + const Uint8* pData, + Uint32 Stride, + TEXTURE_FORMAT SrcFormat, + TEXTURE_FORMAT DstFormat, + bool KeepAlpha); + static EImageFileFormat GetFileFormat(const Uint8* pData, size_t Size); private: - template<typename AllocatorType, typename ObjectType> + template <typename AllocatorType, typename ObjectType> friend class MakeNewRCObj; Image(IReferenceCounters* pRefCounters, IDataBlob* pFileData, const ImageLoadInfo& LoadInfo); - void LoadPngFile( IDataBlob* pFileData, const ImageLoadInfo& LoadInfo ); - void LoadTiffFile( IDataBlob* pFileData, const ImageLoadInfo& LoadInfo ); - void LoadJpegFile( IDataBlob* pFileData, const ImageLoadInfo& LoadInfo ); - - ImageDesc m_Desc; + void LoadPngFile(IDataBlob* pFileData, const ImageLoadInfo& LoadInfo); + void LoadTiffFile(IDataBlob* pFileData, const ImageLoadInfo& LoadInfo); + void LoadJpegFile(IDataBlob* pFileData, const ImageLoadInfo& LoadInfo); + + ImageDesc m_Desc; RefCntAutoPtr<IDataBlob> m_pData; }; @@ -151,8 +151,8 @@ private: /// \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); +EImageFileFormat CreateImageFromFile(const Char* FilePath, + Image** ppImage, + IDataBlob** ppRawData = nullptr); -} +} // namespace Diligent |
