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

13
openVulkanoCpp/Image/ImageLoaderJpeg.cpp
View File

@@ -31,7 +31,7 @@ namespace OpenVulkano::Image
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")
auto image = Utils::ReadFile(filename);
@@ -39,21 +39,22 @@ namespace OpenVulkano::Image
if (!jpegDecompressor)
{
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 status = tjDecompressHeader2(jpegDecompressor, reinterpret_cast<unsigned char*>(image.Data()), image.Size(),
&width, &height, &jpegSubsamp);
&res.x, &res.y, &jpegSubsamp);
if (status != 0)
{
Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
tjDestroy(jpegDecompressor);
return false;
return Math::Vector2i { -1, -1 };
}
tjDestroy(jpegDecompressor);
return true;
return res;
#else
return IImageLoader::GetDimensionsInternal(filename, width, height);
return IImageLoader::GetDimensionsInternal(filename);
#endif
}