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

Merge branch 'wip'

Browse Source
This commit is contained in:
GeorgH93
2024-09-21 15:27:42 +02:00
parent 35b2f49c2e d744d5fdd7
commit 1151e50b64
7 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
openVulkanoCpp/Image/ImageLoaderJpeg.cpp
View File

@@ -6,7 +6,8 @@
#include "ImageLoaderJpeg.hpp"
#include "Base/Utils.hpp"
#include <Data/Containers/Array.hpp>
#include "Base/Logger.hpp"
#include "Data/Containers/Array.hpp"
#include <fstream>
#include <cstring>
@@ -21,8 +22,8 @@ namespace OpenVulkano::Image
{
std::unique_ptr<Image> ImageLoaderJpeg::loadFromFile(const std::string& filePath)
{
Array<char> buffer = OpenVulkano::Utils::ReadFile(filePath);
return loadJpeg(reinterpret_cast<uint8_t*>(buffer.Data()), buffer.Size());
const auto file = Utils::ReadFile(filePath);
return loadJpeg(reinterpret_cast<const uint8_t*>(file.Data()), file.Size());
}
std::unique_ptr<Image> ImageLoaderJpeg::loadFromMemory(const std::vector<uint8_t>& buffer)
@@ -36,19 +37,29 @@ namespace OpenVulkano::Image
{
Image result;
int rows, cols;
int rows = 0, cols = 0;
unsigned char* compressedImage = const_cast<uint8_t*>(data);
int jpegSubsamp;
int jpegSubsamp = 0;
tjhandle jpegDecompressor = tjInitDecompress();
tjDecompressHeader2(jpegDecompressor, compressedImage, size, &cols, &rows, &jpegSubsamp);
if (!jpegDecompressor)
{
Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
return nullptr;
}
int status = tjDecompressHeader2(jpegDecompressor, compressedImage, size, &cols, &rows, &jpegSubsamp);
if (status != 0)
{
Logger::FILESYS->error("Failed to read jpeg header. Error: {}", tjGetErrorStr());
return nullptr;
}
const int channels = 4;
result.data = OpenVulkano::Array<uint8_t>(cols * rows * channels);
result.dataFormat = OpenVulkano::DataFormat::R8G8B8A8_UINT;
result.dataFormat = OpenVulkano::DataFormat::B8G8R8A8_UINT;
tjDecompress2(jpegDecompressor, compressedImage, size, result.data.Data(), cols, 0 /*pitch*/, rows,
TJPF_RGBA, TJFLAG_FASTDCT);
TJPF_BGRA, TJFLAG_FASTDCT);
tjDestroy(jpegDecompressor);
result.resolution.x = cols;
result.resolution.y = rows;
@@ -62,4 +73,4 @@ namespace OpenVulkano::Image
}
#endif
}
}
}