nou/libXISF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

Make bundled zlib use zconf.h

Browse Source
This commit is contained in:
Dušan Poizl
2023-03-10 22:21:03 +01:00
parent 548a00e0e0
commit 3970769d84
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3
View File
@@ -33,6 +33,9 @@ set(THIRD_PARTY_SRC
zlib/trees.c zlib/trees.c
zlib/uncompr.c zlib/uncompr.c
zlib/zutil.c) zlib/zutil.c)
set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
else(USE_BUNDLED_LIBS) else(USE_BUNDLED_LIBS)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED) pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
libxisf.cpp
+2 -2
View File
@@ -131,7 +131,7 @@ void DataBlock::decompress(const ByteArray &input, const String &encoding)
case Zlib: case Zlib:
{ {
data.resize(uncompressedSize); data.resize(uncompressedSize);
uint64_t size = uncompressedSize; uLongf size = uncompressedSize;
::uncompress((Bytef*)data.data(), &size, (Bytef*)tmp.data(), tmp.size()); ::uncompress((Bytef*)data.data(), &size, (Bytef*)tmp.data(), tmp.size());
break; break;
} }
@@ -169,7 +169,7 @@ void DataBlock::compress(int sampleFormatSize)
case Zlib: case Zlib:
{ {
data.resize(compressBound(uncompressedSize)); data.resize(compressBound(uncompressedSize));
size_t compressedSize = data.size(); uLongf compressedSize = data.size();
if(::compress2((Bytef*)data.data(), &compressedSize, (Bytef*)tmp.data(), tmp.size(), compressLevel) != Z_OK) if(::compress2((Bytef*)data.data(), &compressedSize, (Bytef*)tmp.data(), tmp.size(), compressLevel) != Z_OK)
throw Error("Zlib compression failed"); throw Error("Zlib compression failed");
data.resize(compressedSize); data.resize(compressedSize);