Changes version to 1.18 and fixes build with bzip.

goyuix · Apr 18, 2013 · 3c34a12 · 3c34a12
1 parent 873522f
commit 3c34a12
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 3 deletions.
diff --git a/HISTORY b/HISTORY
@@ -3,6 +3,12 @@
                             =======================
 
 
+ADVANCECOMP VERSION 1.18 2013/04
+================================
+
+* Fixed build with BZIP.
+
+
 ADVANCECOMP VERSION 1.17 2013/03
 ================================
 

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
-AC_INIT([AdvanceCOMP],[1.17])
+AC_INIT([AdvanceCOMP],[1.18])
 AM_INIT_AUTOMAKE([foreign no-dependencies])
 AC_CONFIG_SRCDIR([rezip.cc])
 AC_CONFIG_HEADERS([config.h])

diff --git a/doc/history.1 b/doc/history.1
@@ -1,6 +1,11 @@
 .TH "History For AdvanceCOMP" 1
 .SH NAME
 advcomp \(hy History For AdvanceCOMP
+.SH ADVANCECOMP VERSION 1.18 2013/04 
+.PD 0
+.IP \(bu
+Fixed build with BZIP.
+.PD
 .SH ADVANCECOMP VERSION 1.17 2013/03 
 .PD 0
 .IP \(bu

diff --git a/doc/history.d b/doc/history.d
@@ -1,6 +1,9 @@
 Name
 	advcomp - History For AdvanceCOMP
 
+AdvanceCOMP Version 1.18 2013/04
+	) Fixed build with BZIP.
+
 AdvanceCOMP Version 1.17 2013/03
 	) Changed to GPL3.
 	) Added zopfli support. It's enabled using -4, --shrink-insane.

diff --git a/doc/history.html b/doc/history.html
@@ -5,6 +5,14 @@
 <body>
 <center><h2>History For AdvanceCOMP</h2></center>
 <h2> 
+AdvanceCOMP Version 1.18 2013/04
+</h2>
+<ul>
+<li>
+Fixed build with BZIP.
+</li>
+</ul>
+<h2> 
 AdvanceCOMP Version 1.17 2013/03
 </h2>
 <ul>

diff --git a/doc/history.txt b/doc/history.txt
@@ -3,6 +3,12 @@
                             =======================
 
 
+ADVANCECOMP VERSION 1.18 2013/04
+================================
+
+* Fixed build with BZIP.
+
+
 ADVANCECOMP VERSION 1.17 2013/03
 ================================
 

diff --git a/zipsh.cc b/zipsh.cc
@@ -215,11 +215,11 @@ bool zip_entry::shrink(bool standard, shrink_t level)
 		}
 
 #if USE_BZIP2
-		if (level != shrink_fast && !standard) {
+		if (level.level != shrink_fast && !standard) {
 			unsigned bzip2_level;
 			unsigned bzip2_workfactor;
 
-			switch (level) {
+			switch (level.level) {
 			case shrink_normal :
 				bzip2_level = 6;
 				bzip2_workfactor = 30;