Merge pull request #55 from shssoichiro/54-Fix-Broken-zlib

Remove zlib dependency, which broke with the new version of zlib
shssoichiro · Feb 22, 2017 · a5e34cc · a5e34cc
2 parents 705d280 + 8e02aa8
commit a5e34cc
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 215 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+**Version 0.14.1**
+ - Remove zlib dependency and switch entirely to miniz, since zlib 1.2.11 was not working with oxipng. This costs some performance, but is better than having a broken application.
+
 **Version 0.14.0**
  - Performance optimizations
  - [SEMVER_MAJOR] Bump minimum rustc version to 1.13.0

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ homepage = "https://github.com/shssoichiro/oxipng"
 license = "MIT"
 name = "oxipng"
 repository = "https://github.com/shssoichiro/oxipng"
-version = "0.14.0"
+version = "0.14.1"
 
 [lib]
 name = "oxipng"
@@ -25,7 +25,6 @@ byteorder = "^1.0.0"
 crc = "^1.2.0"
 itertools = "^0.5.7"
 libc = "^0.2.4"
-libz-sys = "^1.0.0"
 miniz-sys = "^0.1.7"
 num_cpus = "^1.0.0"
 rayon = "^0.6.0"
@@ -54,3 +53,6 @@ binary = ["clap", "regex"]
 nightly = ["rayon/unstable"]
 nightly-binary = ["binary", "nightly", "regex/simd-accel"]
 dev = ["nightly-binary", "clippy"]
+
+[profile.dev]
+opt-level = 2
diff --git a/README.md b/README.md
@@ -27,9 +27,6 @@ cargo build --release
 cp target/release/oxipng /usr/local/bin
 ```
 
-Please note that zlib is a required build dependency. Oxipng should work with any 1.x version of zlib,
-but you are advised to use the latest version (currently 1.2.11) for security and bug fixes.
-
 The current minimum supported Rust version is **1.13.0**. Oxipng may compile on earlier versions of Rust,
 but there is no guarantee.
 

diff --git a/src/deflate/libz_stream.rs b/src/deflate/libz_stream.rs