G2/lbee-utils
1
0
Fork 0
mirror of https://github.com/G2-Games/lbee-utils.git synced 2025-04-19 15:22:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed CZ2 compression to be more accurate

Browse source
This commit is contained in:
G2-Games 2024-07-16 03:16:27 -05:00
parent 9f7e39a8a3
commit a4bb11aeb4
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cz/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "cz" name = "cz"
edition = "2021" edition = "2021"
version = "0.1.2" version = "0.1.3"
description=""" description="""
An encoder/decoder for CZ# image files used in the LUCA System engine by An encoder/decoder for CZ# image files used in the LUCA System engine by
Prototype Ltd. Prototype Ltd.

23
cz/src/compression.rs
View file

@ -312,9 +312,7 @@ fn compress_lzw(data: &[u8], size: usize, last: Vec<u8>) -> (usize, Vec<u16>, Ve
(count, compressed, last_element) (count, compressed, last_element)
} }
pub fn compress2(data: &[u8], size: usize) -> (Vec<u8>, CompressionInfo) { pub fn compress2(data: &[u8]) -> (Vec<u8>, CompressionInfo) {
let size = if size == 0 { 0x87BDF } else { size };
let mut part_data; let mut part_data;
let mut offset = 0; let mut offset = 0;
@ -328,7 +326,7 @@ pub fn compress2(data: &[u8], size: usize) -> (Vec<u8>, CompressionInfo) {
}; };
loop { loop {
(count, part_data, last) = compress_lzw2(&data[offset..], size, last); (count, part_data, last) = compress_lzw2(&data[offset..], last);
if count == 0 { if count == 0 {
break; break;
} }
@ -346,20 +344,13 @@ pub fn compress2(data: &[u8], size: usize) -> (Vec<u8>, CompressionInfo) {
if output_info.chunk_count == 0 { if output_info.chunk_count == 0 {
panic!("No chunks compressed!") panic!("No chunks compressed!")
} else if output_info.chunk_count != 1 {
output_info.chunks[0].size_raw -= 1;
output_info.chunks[output_info.chunk_count - 1].size_raw += 1;
} }
output_info.total_size_compressed = output_buf.len(); output_info.total_size_compressed = output_buf.len();
(output_buf, output_info) (output_buf, output_info)
} }
fn compress_lzw2(data: &[u8], size: usize, last: Vec<u8>) -> (usize, Vec<u8>, Vec<u8>) { fn compress_lzw2(data: &[u8], last: Vec<u8>) -> (usize, Vec<u8>, Vec<u8>) {
let mut data = data.to_vec();
if !data.is_empty() {
data[0] = 0;
}
let mut count = 0; let mut count = 0;
let mut dictionary = HashMap::new(); let mut dictionary = HashMap::new();
for i in 0..=255 { for i in 0..=255 {
@ -372,7 +363,7 @@ fn compress_lzw2(data: &[u8], size: usize, last: Vec<u8>) -> (usize, Vec<u8>, Ve
element = last element = last
} }
let mut bit_io = BitIo::new(vec![0u8; size + 2]); let mut bit_io = BitIo::new(vec![0u8; 0xF0000]);
let write_bit = |bit_io: &mut BitIo, code: u64| { let write_bit = |bit_io: &mut BitIo, code: u64| {
if code > 0x7FFF { if code > 0x7FFF {
bit_io.write_bit(1, 1); bit_io.write_bit(1, 1);
@ -398,9 +389,9 @@ fn compress_lzw2(data: &[u8], size: usize, last: Vec<u8>) -> (usize, Vec<u8>, Ve
count += 1; count += 1;
if size > 0 && bit_io.byte_size() >= size { if dictionary_count >= 0x3FFFE {
count -= 1; count -= 1;
break; break
} }
} }
@ -412,7 +403,7 @@ fn compress_lzw2(data: &[u8], size: usize, last: Vec<u8>) -> (usize, Vec<u8>, Ve
} }
} }
return (count, bit_io.bytes(), Vec::new()); return (count, bit_io.bytes(), Vec::new());
} else if bit_io.byte_size() < size { } else if bit_io.byte_size() < 0x87BDF {
if !last_element.is_empty() { if !last_element.is_empty() {
write_bit(&mut bit_io, *dictionary.get(&last_element).unwrap()); write_bit(&mut bit_io, *dictionary.get(&last_element).unwrap());
} }

2
cz/src/formats/cz2.rs
View file

@ -16,7 +16,7 @@ pub fn decode<T: Seek + ReadBytesExt + Read>(bytes: &mut T) -> Result<Vec<u8>, C
} }
pub fn encode<T: WriteBytesExt + Write>(output: &mut T, bitmap: &[u8]) -> Result<(), CzError> { pub fn encode<T: WriteBytesExt + Write>(output: &mut T, bitmap: &[u8]) -> Result<(), CzError> {
let (compressed_data, compressed_info) = compress2(bitmap, 0x87BDF); let (compressed_data, compressed_info) = compress2(&bitmap);
compressed_info.write_into(output)?; compressed_info.write_into(output)?;