AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 14:24:56 +00:00
Code Issues Projects Releases Wiki Activity

Switch to lzokay library

Browse Source
This commit is contained in:
Jack Andersen
2018-12-19 17:45:48 -10:00
parent b7f35e0528
commit e716d05cec
11 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/CMakeLists.txt
View File

@@ -30,7 +30,7 @@ macro(dataspec_add_list rel_path a_list)
set(${a_list} "${tmp_list}")
endmacro(dataspec_add_list)
include_directories(${ZLIB_INCLUDE_DIR} ${LZO_INCLUDE_DIR})
include_directories(${ZLIB_INCLUDE_DIR} ${LZOKAY_INCLUDE_DIR})
# Each game's DNA library
include(DNACommon/CMakeLists.txt)

6
DataSpec/DNAMP1/PAK.cpp
View File

@@ -1,5 +1,5 @@
#include <zlib.h>
#include <lzo/lzo1x.h>
#include <lzokay.hpp>
#include "DNAMP1.hpp"
#include "PAK.hpp"
#include "AGSC.hpp"
@@ -122,8 +122,8 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const nod::Node& pak, atUint64&
strm->read(&chunkSz, 2);
chunkSz = hecl::SBig(chunkSz);
strm->read(compBuf, chunkSz);
lzo_uint dsz = rem;
lzo1x_decompress(compBuf, chunkSz, bufCur, &dsz, nullptr);
size_t dsz = rem;
lzokay::decompress(compBuf, chunkSz, bufCur, dsz);
bufCur += dsz;
rem -= dsz;
}

6
DataSpec/DNAMP2/MREA.cpp
View File

@@ -1,5 +1,5 @@
#include <athena/FileWriter.hpp>
#include <lzo/lzo1x.h>
#include <lzokay.hpp>
#include "MREA.hpp"
#include "../DNAMP1/MREA.hpp"
#include "DataSpec/DNACommon/EGMC.hpp"
@@ -47,8 +47,8 @@ void MREA::StreamReader::nextBlock() {
rem -= chunkSz;
} else {
m_source.readUBytesToBuf(m_compBuf.get(), chunkSz);
lzo_uint dsz = rem;
lzo1x_decompress(m_compBuf.get(), chunkSz, bufCur, &dsz, nullptr);
size_t dsz = rem;
lzokay::decompress(m_compBuf.get(), chunkSz, bufCur, dsz);
bufCur += dsz;
rem -= dsz;
}

4
DataSpec/DNAMP3/PAK.cpp
View File

@@ -179,8 +179,8 @@ std::unique_ptr<atUint8[]> PAK::Entry::getBuffer(const nod::Node& pak, atUint64&
while (rem) {
atUint16 chunkSz = hecl::SBig(*(atUint16*)compBufCur);
compBufCur += 2;
lzo_uint dsz = rem;
lzo1x_decompress(compBufCur, chunkSz, bufCur, &dsz, nullptr);
size_t dsz = rem;
lzokay::decompress(compBufCur, chunkSz, bufCur, dsz);
compBufCur += chunkSz;
bufCur += dsz;
rem -= dsz;

2
DataSpec/DNAMP3/PAK.hpp
View File

@@ -2,7 +2,7 @@
#include <unordered_map>
#include <lzo/lzo1x.h>
#include <lzokay.hpp>
#include <nod/DiscBase.hpp>
#include "DataSpec/DNACommon/PAK.hpp"