danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moderately improve cyclomatic complexity

Browse source
This commit is contained in:
Joshua Holmer 2016-04-22 13:31:59 -04:00
parent fac83c023d
commit 2c3e35d8bb
1 changed files with 72 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
src/lib.rs
View file

@ -151,45 +151,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
} }
} }
let mut something_changed = false; let something_changed = perform_reductions(&mut png, &opts);
if opts.palette_reduction {
if png.reduce_palette() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if opts.bit_depth_reduction {
if png.reduce_bit_depth() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if opts.color_type_reduction {
if png.reduce_color_type() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if something_changed && opts.verbosity.is_some() {
report_reduction(&png);
}
if let Some(interlacing) = opts.interlace {
if png.change_interlacing(interlacing) {
png.ihdr_data.interlaced = interlacing;
something_changed = true;
}
}
if opts.idat_recoding || something_changed { if opts.idat_recoding || something_changed {
// Use 1 thread on single-core, otherwise use threads = 1.5x CPU cores // Use 1 thread on single-core, otherwise use threads = 1.5x CPU cores
@ -270,29 +232,7 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
} }
} }
match opts.strip.clone() { perform_strip(&mut png, &opts);
// Strip headers
png::Headers::None => (),
png::Headers::Some(hdrs) => {
for hdr in &hdrs {
png.aux_headers.remove(hdr);
}
}
png::Headers::Safe => {
const PRESERVED_HEADERS: [&'static str; 9] = ["cHRM", "gAMA", "iCCP", "sBIT", "sRGB",
"bKGD", "hIST", "pHYs", "sPLT"];
let mut preserved = HashMap::new();
for (hdr, contents) in &png.aux_headers {
if PRESERVED_HEADERS.contains(&hdr.as_ref()) {
preserved.insert(hdr.clone(), contents.clone());
}
}
png.aux_headers = preserved;
}
png::Headers::All => {
png.aux_headers = HashMap::new();
}
}
let output_data = png.output(); let output_data = png.output();
if file_original_size <= output_data.len() && !opts.force && opts.interlace.is_none() { if file_original_size <= output_data.len() && !opts.force && opts.interlace.is_none() {
@ -381,6 +321,50 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
Ok(()) Ok(())
} }
fn perform_reductions(png: &mut png::PngData, opts: &Options) -> bool {
let mut something_changed = false;
if opts.palette_reduction {
if png.reduce_palette() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if opts.bit_depth_reduction {
if png.reduce_bit_depth() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if opts.color_type_reduction {
if png.reduce_color_type() {
something_changed = true;
if opts.verbosity == Some(1) {
report_reduction(&png);
}
};
}
if something_changed && opts.verbosity.is_some() {
report_reduction(&png);
}
if let Some(interlacing) = opts.interlace {
if png.change_interlacing(interlacing) {
png.ihdr_data.interlaced = interlacing;
something_changed = true;
}
}
something_changed
}
fn report_reduction(png: &png::PngData) { fn report_reduction(png: &png::PngData) {
if let Some(palette) = png.palette.clone() { if let Some(palette) = png.palette.clone() {
writeln!(&mut stderr(), writeln!(&mut stderr(),
@ -397,3 +381,29 @@ fn report_reduction(png: &png::PngData) {
.ok(); .ok();
} }
} }
fn perform_strip(png: &mut png::PngData, opts: &Options) {
match opts.strip.clone() {
// Strip headers
png::Headers::None => (),
png::Headers::Some(hdrs) => {
for hdr in &hdrs {
png.aux_headers.remove(hdr);
}
}
png::Headers::Safe => {
const PRESERVED_HEADERS: [&'static str; 9] = ["cHRM", "gAMA", "iCCP", "sBIT", "sRGB",
"bKGD", "hIST", "pHYs", "sPLT"];
let mut preserved = HashMap::new();
for (hdr, contents) in &png.aux_headers {
if PRESERVED_HEADERS.contains(&hdr.as_ref()) {
preserved.insert(hdr.clone(), contents.clone());
}
}
png.aux_headers = preserved;
}
png::Headers::All => {
png.aux_headers = HashMap::new();
}
}
}