Fix issue for interlacing images smaller than 4px

Fixes #42
shssoichiro · May 26, 2016 · 2659776 · 2659776
1 parent aff99f2
commit 2659776
Show file tree

Hide file tree

Showing 8 changed files with 307 additions and 258 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+**Version 0.8.2**
+ - Fix issue where images smaller than 4px width would crash on interlacing ([#42](https://github.com/shssoichiro/oxipng/issues/42))
+
 **Version 0.8.1**
  - Minor optimizations
  - Fix issue where interlaced images with certain widths would fail to optimize

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oxipng"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Joshua Holmer <jholmer.in@gmail.com>"]
 description = "A lossless PNG compression optimizer"
 license = "MIT"

diff --git a/src/lib.rs b/src/lib.rs
@@ -185,9 +185,9 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
             match copy(in_file,
                        in_file.with_extension(format!("bak.{}",
                                                       in_file.extension()
-                                                             .unwrap()
-                                                             .to_str()
-                                                             .unwrap()))) {
+                                                          .unwrap()
+                                                          .to_str()
+                                                          .unwrap()))) {
                 Ok(x) => x,
                 Err(_) => {
                     return Err(format!("Unable to write to backup file at {}",
@@ -222,9 +222,9 @@ pub fn optimize(filepath: &Path, opts: &Options) -> Result<(), String> {
                                     match out_file.metadata() {
                                         Ok(out_meta) => {
                                             let readonly = metadata.permissions()
-                                                                   .readonly();
+                                                .readonly();
                                             out_meta.permissions()
-                                                    .set_readonly(readonly);
+                                                .set_readonly(readonly);
                                         }
                                         Err(_) => {
                                             if opts.verbosity.is_some() {
@@ -388,12 +388,9 @@ fn optimize_png(mut png: &mut png::PngData, file_original_size: usize, opts: &Op
                 let filtered = filters.get(&trial.0).unwrap();
                 let best = best.clone();
                 scope.execute(move || {
-                    let new_idat = deflate::deflate::deflate(filtered,
-                                                             trial.1,
-                                                             trial.2,
-                                                             trial.3,
-                                                             opts.window)
-                                       .unwrap();
+                    let new_idat =
+                        deflate::deflate::deflate(filtered, trial.1, trial.2, trial.3, opts.window)
+                            .unwrap();
 
                     if opts.verbosity == Some(1) {
                         writeln!(&mut stderr(),