Use lc_lz2::CompressV3 for CompressOverworld

This commit is contained in:
scawful
2024-01-26 23:19:46 -05:00
parent 5a3a693c59
commit c7762a8a2e
2 changed files with 9 additions and 2 deletions

View File

@@ -598,6 +598,11 @@ absl::StatusOr<Bytes> CompressOverworld(const uchar* data, const int pos,
return CompressV2(data, pos, length, kNintendoMode1); return CompressV2(data, pos, length, kNintendoMode1);
} }
absl::StatusOr<Bytes> CompressOverworld(const std::vector<uint8_t> data,
const int pos, const int length) {
return CompressV3(data, pos, length, kNintendoMode1);
}
// ============================================================================ // ============================================================================
// Compression V3 // Compression V3
@@ -1019,7 +1024,7 @@ void FinalizeCompression(CompressionContext& context) {
<< context.compressed_data.size()); << context.compressed_data.size());
} }
absl::StatusOr<Bytes> CompressV3(const std::vector<uint8_t> data, absl::StatusOr<Bytes> CompressV3(const std::vector<uint8_t>& data,
const int start, const int length, int mode, const int start, const int length, int mode,
bool check) { bool check) {
if (length == 0) { if (length == 0) {

View File

@@ -128,6 +128,8 @@ absl::StatusOr<Bytes> CompressGraphics(const uchar* data, const int pos,
const int length); const int length);
absl::StatusOr<Bytes> CompressOverworld(const uchar* data, const int pos, absl::StatusOr<Bytes> CompressOverworld(const uchar* data, const int pos,
const int length); const int length);
absl::StatusOr<Bytes> CompressOverworld(const std::vector<uint8_t> data,
const int pos, const int length);
absl::StatusOr<CompressionPiecePointer> SplitCompressionPiece( absl::StatusOr<CompressionPiecePointer> SplitCompressionPiece(
CompressionPiecePointer& piece, int mode); CompressionPiecePointer& piece, int mode);
@@ -185,7 +187,7 @@ absl::StatusOr<CompressionPiece> SplitCompressionPieceV3(
CompressionPiece& piece, int mode); CompressionPiece& piece, int mode);
void FinalizeCompression(CompressionContext& context); void FinalizeCompression(CompressionContext& context);
absl::StatusOr<Bytes> CompressV3(const std::vector<uint8_t> data, absl::StatusOr<Bytes> CompressV3(const std::vector<uint8_t>& data,
const int start, const int length, const int start, const int length,
int mode = 1, bool check = false); int mode = 1, bool check = false);