From ec3d49e514a2b385596bb6660954248ba314b476 Mon Sep 17 00:00:00 2001
From: Mathis Rosenhauer <rosenhauer@dkrz.de>
Date: Wed, 4 Feb 2015 11:23:04 +0100
Subject: [PATCH] Version bump.
---
CMakeLists.txt | 4 ++--
ChangeLog | 8 ++++++++
configure.ac | 2 +-
src/CMakeLists.txt | 4 ++--
src/Makefile.am | 4 ++--
src/aec.c | 2 +-
src/decode.c | 2 +-
src/decode.h | 2 +-
src/encode.c | 2 +-
src/encode.h | 2 +-
src/encode_accessors.c | 2 +-
src/encode_accessors.h | 2 +-
src/libaec.h | 2 +-
src/utime.c | 2 +-
14 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f0bff3..b20b04e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE(cmake/macros.cmake)
PROJECT(libaec)
SET(libaec_VERSION_MAJOR 0)
SET(libaec_VERSION_MINOR 3)
-SET(libaec_VERSION_PATCH 1)
+SET(libaec_VERSION_PATCH 2)
SET(CMAKE_BUILD_TYPE Release)
ENABLE_TESTING()
@@ -51,7 +51,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"libaec - Adaptive Entropy Coding library")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libaec")
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
diff --git a/ChangeLog b/ChangeLog
index eef1806..1220387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-04 Mathis Rosenhauer <rosenhauer@dkrz.de>
+
+ v0.3.2
+
+ Allow nonconforming block sizes in SZ mode.
+
+ Performance improvement for decoder.
+
2014-10-23 Mathis Rosenhauer <rosenhauer@dkrz.de>
v0.3.1
diff --git a/configure.ac b/configure.ac
index 015e00c..e895b53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.64])
-AC_INIT([libaec], [0.3.1], [rosenhauer@dkrz.de])
+AC_INIT([libaec], [0.3.2], [rosenhauer@dkrz.de])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b1cd462..3625f06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
SET(libaec_SRCS encode.c encode_accessors.c decode.c)
ADD_LIBRARY(aec ${LIB_TYPE} ${libaec_SRCS})
SET_TARGET_PROPERTIES(aec PROPERTIES
- SOVERSION 0.0.2
+ SOVERSION 0.0.3
)
ADD_LIBRARY(sz ${LIB_TYPE} sz_compat.c)
SET_TARGET_PROPERTIES(sz PROPERTIES
- SOVERSION 2.0.2
+ SOVERSION 2.0.1
)
TARGET_LINK_LIBRARIES(sz aec)
diff --git a/src/Makefile.am b/src/Makefile.am
index d520219..1ee7d01 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
lib_LTLIBRARIES = libaec.la libsz.la
libaec_la_SOURCES = encode.c encode_accessors.c decode.c \
encode.h encode_accessors.h decode.h
-libaec_la_LDFLAGS = -version-info 0:2:0
+libaec_la_LDFLAGS = -version-info 0:3:0
libsz_la_SOURCES = sz_compat.c
libsz_la_LIBADD = libaec.la
-libsz_la_LDFLAGS = -version-info 2:2:0
+libsz_la_LDFLAGS = -version-info 2:1:0
include_HEADERS = libaec.h szlib.h
diff --git a/src/aec.c b/src/aec.c
index dbfe91c..90d419c 100644
--- a/src/aec.c
+++ b/src/aec.c
@@ -2,7 +2,7 @@
* @file aec.c
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/decode.c b/src/decode.c
index c1b5ba1..3a8b7fe 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -2,7 +2,7 @@
* @file decode.c
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/decode.h b/src/decode.h
index 6dee669..f25649d 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -2,7 +2,7 @@
* @file decode.c
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/encode.c b/src/encode.c
index b6b5e26..096e7cd 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -2,7 +2,7 @@
* @file encode.c
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/encode.h b/src/encode.h
index c5e633b..49c6926 100644
--- a/src/encode.h
+++ b/src/encode.h
@@ -2,7 +2,7 @@
* @file encode.h
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/encode_accessors.c b/src/encode_accessors.c
index 432e990..f3af838 100644
--- a/src/encode_accessors.c
+++ b/src/encode_accessors.c
@@ -2,7 +2,7 @@
* @file encode_accessors.c
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/encode_accessors.h b/src/encode_accessors.h
index 9103df4..4a1fc02 100644
--- a/src/encode_accessors.h
+++ b/src/encode_accessors.h
@@ -2,7 +2,7 @@
* @file encode_accessors.h
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/libaec.h b/src/libaec.h
index e1ba30c..5d2a4ab 100644
--- a/src/libaec.h
+++ b/src/libaec.h
@@ -2,7 +2,7 @@
* @file libaec.h
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
diff --git a/src/utime.c b/src/utime.c
index 08972fc..4b3458c 100644
--- a/src/utime.c
+++ b/src/utime.c
@@ -4,7 +4,7 @@
* @author Thomas Jahns, Deutsches Klimarechenzentrum
*
* @section LICENSE
- * Copyright 2012 - 2014
+ * Copyright 2012 - 2015
*
* Mathis Rosenhauer, Moritz Hanke, Joerg Behrens
* Deutsches Klimarechenzentrum GmbH
--
GitLab