G2/lbee-utils
1
0
Fork 0
mirror of https://github.com/G2-Games/lbee-utils.git synced 2025-04-18 23:02:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed image as a dependency from cz

Browse source
This commit is contained in:
G2-Games 2024-11-13 10:53:15 -06:00
parent ec60308e6a
commit dd99a0d834
6 changed files with 39 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cz/Cargo.toml
View file

@ -9,17 +9,11 @@ Prototype Ltd.
license = "MIT"
authors.workspace = true
[features]
png = ["dep:image"]
[dependencies]
byteorder-lite = "0.1.0"
thiserror = "1.0"
byteorder-lite = "0.1"
thiserror = "2.0"
imagequant = "4.3"
rgb = "0.8"
# Only active on PNG feature
image = { version = "0.25", optional = true }
[lints]
workspace = true

29
cz/src/dynamic.rs
View file

@ -192,35 +192,6 @@ impl DynamicCz {
Ok(())
}
/// Save the CZ# image as a lossless PNG file.
///
/// Internally, the [`DynamicCz`] struct operates on 32-bit RGBA values,
/// which is the highest encountered in CZ# files, therefore saving them
/// as a PNG of the same or better quality is lossless.
#[cfg(feature = "png")]
pub fn save_as_png<P: ?Sized + AsRef<std::path::Path>>(
&self,
path: &P,
) -> Result<(), image::error::EncodingError> {
let size = (self.header_common.width() as u32 * self.header_common.height() as u32) * 4;
let mut buf = vec![0; size as usize];
buf[..self.bitmap.len()].copy_from_slice(&self.bitmap);
let image = image::RgbaImage::from_raw(
self.header_common.width() as u32,
self.header_common.height() as u32,
buf.clone(),
)
.unwrap();
image
.save_with_format(path, image::ImageFormat::Png)
.unwrap();
Ok(())
}
/// Create a CZ# image from RGBA bytes. The bytes *must* be RGBA, as that
/// is the only format that is used internally.
pub fn from_raw(version: CzVersion, width: u16, height: u16, bitmap: Vec<u8>) -> Self {

3
pak_explorer/Cargo.toml
View file

@ -11,9 +11,10 @@ publish = false
[dependencies]
colog = "1.3.0"
cz = { path = "../cz/", features = ["png"] }
cz = { path = "../cz/" }
eframe = { version = "0.28.1", default-features = false, features = ["wayland", "x11", "accesskit", "default_fonts", "wgpu"] }
egui_extras = "0.28.1"
image = { version = "0.25.5", default-features = false, features = ["png"] }
log = "0.4.22"
luca_pak = { path = "../luca_pak/" }
rfd = "0.14.1"

9
pak_explorer/src/main.rs
View file

@ -162,7 +162,14 @@ impl eframe::App for PakExplorer {
entry.as_bytes(),
))
.unwrap();
cz.save_as_png(&path).unwrap();
image::save_buffer_with_format(
path,
cz.as_raw(),
cz.header().width() as u32,
cz.header().height() as u32,
image::ColorType::Rgba8,
image::ImageFormat::Png
).unwrap();
}
}

2
utils/Cargo.toml
View file

@ -13,7 +13,7 @@ name = "czutil"
name = "pakutil"
[dependencies]
cz = { path = "../cz/", features = ["png"] }
cz = { path = "../cz/" }
luca_pak = { path = "../luca_pak/" }
image = { version = "0.25", default-features = false, features = ["png"] }

30
utils/src/bin/czutil.rs
View file

@ -1,4 +1,5 @@
use clap::{error::ErrorKind, Command, Error, Parser, Subcommand};
use clap::{error::ErrorKind, Error, Parser, Subcommand};
use image::ColorType;
use std::{
fs,
path::{Path, PathBuf},
@ -145,16 +146,37 @@ fn main() {
}
};
cz.save_as_png(&final_path).unwrap();
image::save_buffer_with_format(
final_path,
cz.as_raw(),
cz.header().width() as u32,
cz.header().height() as u32,
ColorType::Rgba8,
image::ImageFormat::Png
).unwrap();
}
} else {
let cz = cz::open(input).unwrap();
if let Some(output) = output {
cz.save_as_png(output).unwrap();
image::save_buffer_with_format(
output,
cz.as_raw(),
cz.header().width() as u32,
cz.header().height() as u32,
ColorType::Rgba8,
image::ImageFormat::Png
).unwrap();
} else {
let file_stem = PathBuf::from(input.file_name().unwrap());
cz.save_as_png(&file_stem.with_extension("png")).unwrap();
image::save_buffer_with_format(
file_stem.with_extension("png"),
cz.as_raw(),
cz.header().width() as u32,
cz.header().height() as u32,
ColorType::Rgba8,
image::ImageFormat::Png
).unwrap();
}
}
}