diff --git a/openVulkanoCpp/Base/Utils.hpp b/openVulkanoCpp/Base/Utils.hpp index 8419419..7654bc9 100644 --- a/openVulkanoCpp/Base/Utils.hpp +++ b/openVulkanoCpp/Base/Utils.hpp @@ -15,8 +15,6 @@ #include #include #include -#include -#include #include "Data/Containers/Array.hpp" namespace OpenVulkano @@ -206,26 +204,6 @@ namespace OpenVulkano return id; } - static unsigned char* STBZlibCompressor(unsigned char* data, int data_len, int* out_len, int quality) - { - uLong maxCompressedSize = compressBound(data_len); - void* outData = malloc(maxCompressedSize); - if (!outData) - { - *out_len = 0; - return nullptr; - } - int result = compress2(static_cast(outData), &maxCompressedSize, data, data_len, Z_BEST_COMPRESSION); - if (result != Z_OK) - { - free(outData); - *out_len = 0; - return nullptr; - } - *out_len = static_cast(maxCompressedSize); - return static_cast(outData); - } - static std::string DemangleTypeName(const char* name); }; } diff --git a/openVulkanoCpp/Extensions/STBZlibCompressor.hpp b/openVulkanoCpp/Extensions/STBZlibCompressor.hpp new file mode 100644 index 0000000..f21274b --- /dev/null +++ b/openVulkanoCpp/Extensions/STBZlibCompressor.hpp @@ -0,0 +1,33 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include +#include + +namespace Extensions +{ + static unsigned char* STBZlibCompressor(unsigned char* data, int data_len, int* out_len, int quality) + { + uLong maxCompressedSize = compressBound(data_len); + void* outData = malloc(maxCompressedSize); + if (!outData) + { + *out_len = 0; + return nullptr; + } + int result = compress2(static_cast(outData), &maxCompressedSize, data, data_len, Z_BEST_COMPRESSION); + if (result != Z_OK) + { + free(outData); + *out_len = 0; + return nullptr; + } + *out_len = static_cast(maxCompressedSize); + return static_cast(outData); + } +} \ No newline at end of file diff --git a/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp b/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp index 7259916..b1218af 100644 --- a/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp +++ b/openVulkanoCpp/Scene/FontAtlasGeneratorBase.cpp @@ -6,12 +6,12 @@ #include "FontAtlasGeneratorBase.hpp" #include "Base/Logger.hpp" -#include +#include "Extensions/STBZlibCompressor.hpp" #include #include #define STBI_MSC_SECURE_CRT #define STB_IMAGE_WRITE_IMPLEMENTATION -#define STBIW_ZLIB_COMPRESS OpenVulkano::Utils::STBZlibCompressor +#define STBIW_ZLIB_COMPRESS Extensions::STBZlibCompressor #include namespace OpenVulkano::Scene