GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change signature

Browse Source
This commit is contained in:
ohyzha
2024-10-07 17:46:34 +03:00
parent a4e716006a
commit aaa8974006
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openVulkanoCpp/Image/ImageLoader.cpp
View File

@@ -61,9 +61,15 @@ namespace OpenVulkano::Image
return std::make_unique<Image>(std::move(result)); return std::make_unique<Image>(std::move(result));
} }
bool IImageLoader::GetDimensionsInternal(const std::string& filename, int& width, int& height) Math::Vector2i IImageLoader::GetDimensionsInternal(const std::string& filename)
{ {
Math::Vector2i res = {};
int channels; int channels;
return stbi_info(filename.c_str(), &width, &height, &channels); if (!stbi_info(filename.c_str(), &res.x, &res.y, &channels))
{
Logger::FILESYS->error("Failed to read image header of file {}", filename);
return Math::Vector2i{ -1, -1 };
}
return res;
} }
} }

4
openVulkanoCpp/Image/ImageLoader.hpp
View File

@@ -21,8 +21,8 @@ namespace OpenVulkano::Image
static std::unique_ptr<Image> loadData(const uint8_t* data, int size, int desiredChannels = 0); static std::unique_ptr<Image> loadData(const uint8_t* data, int size, int desiredChannels = 0);
virtual std::unique_ptr<Image> loadFromFile(const std::string& filePath) = 0; virtual std::unique_ptr<Image> loadFromFile(const std::string& filePath) = 0;
virtual std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) = 0; virtual std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) = 0;
virtual bool GetImageDimensions(const std::string& filename, int& width, int& height) = 0; virtual Math::Vector2i GetImageDimensions(const std::string& filename) = 0;
protected: protected:
static bool GetDimensionsInternal(const std::string& filename, int& width, int& height); static Math::Vector2i GetDimensionsInternal(const std::string& filename);
}; };
} }

13
openVulkanoCpp/Image/ImageLoaderJpeg.cpp
View File

@@ -31,7 +31,7 @@ namespace OpenVulkano::Image
return loadJpeg(buffer.data(), buffer.size()); return loadJpeg(buffer.data(), buffer.size());
} }
bool ImageLoaderJpeg::GetImageDimensions(const std::string& filename, int& width, int& height) Math::Vector2i ImageLoaderJpeg::GetImageDimensions(const std::string& filename)
{ {
#if __has_include("turbojpeg.h") #if __has_include("turbojpeg.h")
auto image = Utils::ReadFile(filename); auto image = Utils::ReadFile(filename);
@@ -39,21 +39,22 @@ namespace OpenVulkano::Image
if (!jpegDecompressor) if (!jpegDecompressor)
{ {
Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr()); Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
return false; return Math::Vector2i { -1, -1 };
} }
Math::Vector2i res = {};
int size = 0, jpegSubsamp = 0; int size = 0, jpegSubsamp = 0;
int status = tjDecompressHeader2(jpegDecompressor, reinterpret_cast<unsigned char*>(image.Data()), image.Size(), int status = tjDecompressHeader2(jpegDecompressor, reinterpret_cast<unsigned char*>(image.Data()), image.Size(),
&width, &height, &jpegSubsamp); &res.x, &res.y, &jpegSubsamp);
if (status != 0) if (status != 0)
{ {
Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr()); Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
tjDestroy(jpegDecompressor); tjDestroy(jpegDecompressor);
return false; return Math::Vector2i { -1, -1 };
} }
tjDestroy(jpegDecompressor); tjDestroy(jpegDecompressor);
return true; return res;
#else #else
return IImageLoader::GetDimensionsInternal(filename, width, height); return IImageLoader::GetDimensionsInternal(filename);
#endif #endif
} }

2
openVulkanoCpp/Image/ImageLoaderJpeg.hpp
View File

@@ -15,7 +15,7 @@ namespace OpenVulkano::Image
public: public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override; std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override; std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
bool GetImageDimensions(const std::string& filename, int& width, int& height) override; Math::Vector2i GetImageDimensions(const std::string& filename) override;
private: private:
std::unique_ptr<Image> loadJpeg(const uint8_t* data, size_t size); std::unique_ptr<Image> loadJpeg(const uint8_t* data, size_t size);
}; };

4
openVulkanoCpp/Image/ImageLoaderPng.cpp
View File

@@ -23,8 +23,8 @@ namespace OpenVulkano::Image
return loadData(buffer.data(), static_cast<int>(buffer.size())); return loadData(buffer.data(), static_cast<int>(buffer.size()));
} }
bool ImageLoaderPng::GetImageDimensions(const std::string& filename, int& width, int& height) Math::Vector2i ImageLoaderPng::GetImageDimensions(const std::string& filename)
{ {
return GetDimensionsInternal(filename, width, height); return GetDimensionsInternal(filename);
} }
} }

2
openVulkanoCpp/Image/ImageLoaderPng.hpp
View File

@@ -15,6 +15,6 @@ namespace OpenVulkano::Image
public: public:
std::unique_ptr<Image> loadFromFile(const std::string& filePath) override; std::unique_ptr<Image> loadFromFile(const std::string& filePath) override;
std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override; std::unique_ptr<Image> loadFromMemory(const std::vector<uint8_t>& buffer) override;
bool GetImageDimensions(const std::string& filename, int& width, int& height) override; Math::Vector2i GetImageDimensions(const std::string& filename) override;
}; };
} }