Release of version 1.2.0

diff --git a/ChangeLog b/ChangeLog
index 0953061770cc924b4183d46591feb924ba7ffe62..9766cea923a72c4def44b61f76f1a93feb1de366 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+----------------------
+MAY 4, 2007
+VERSION 1.2.0 RELEASED
+----------------------
+
 May 4, 2007
 * [FOD] Bugs corrected in decoding of command line (getopt.c), in the handling of 16 bit files (t1.c and tcd.c) and the calculation of elapsed time for multiple tiles parts (tcd.c and tdc.h).
 
@@ -118,9 +123,13 @@ February 26, 2007
 + [Parvatha] Option to read images from a Folder whose path is specified in the Input parameters by "-ImgDir" along with output decod format specified by "-OutFor" . Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
 + [Parvatha] Enabling use of multi character input parameters in the codec. Modifications in image_to_j2k.c, j2k_to_image.c, getopt.c, getopt.h
 
+----------------------
+February 23, 2007
+VERSION 1.1.1 RELEASED
+----------------------
+
 February 23, 2007
 * [GB] Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL section of decoder parameters structure in openjpeg.h; minor type-casting in jpwl_lib.c. As a result, now OPJViewer should run correctly when built against the most current SVN trunk of LibOpenJPEG.lib
-* [FOD] Changed version number from 1.1.0 to 1.1.1 in openjpeg.h
 + [GB] Linux makefile for the JPWL module; newlines at end of JPWL files
 
 February 22, 2007

diff --git a/Makefile b/Makefile
index 932128b40f2a2327c3104947d8e884cb77477d2f..eb97b9405fddb08ebd112a92874f08b2ed2ae768 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Linux makefile for OpenJPEG
 
-VER_MAJOR = 1
-VER_MINOR = 1.1
+VER_MAJOR = 2
+VER_MINOR = 1.2.0
 
 SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.c ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c
 INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.h ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_includes.h

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index d866cc6d513c1160dd4273b5d6ed77bc2c5aeec9..e74c90ee3cbbe7d7fac5eccec4c2365944f1aff4 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -32,7 +32,7 @@
 #ifndef OPENJPEG_H
 #define OPENJPEG_H
 
-#define OPENJPEG_VERSION "1.1.1"
+#define OPENJPEG_VERSION "1.2.0"
 
 /* 
 ==========================================================