From 6adb5f50703ff6587d26205df61dd217b16b4d2e Mon Sep 17 00:00:00 2001
From: Antonin Descampe <antonin@gmail.com>
Date: Tue, 16 Aug 2011 13:23:36 +0000
Subject: [PATCH] added NEWS, AUTHORS and THANKS files. Cosmetic changes in
 autotools files

---
 AUTHORS                        | 13 +++++++++++++
 CHANGES                        |  1 +
 LICENSE                        | 11 ++++++-----
 NEWS                           | 33 +++++++++++++++++++++++++++++++++
 README                         |  8 +++++---
 THANKS                         | 32 ++++++++++++++++++++++++++++++++
 applications/codec/Makefile.am |  2 +-
 configure.ac                   |  3 ++-
 8 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 AUTHORS
 create mode 100644 NEWS
 create mode 100644 THANKS

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..dd765ac0
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,13 @@
+Authors of OpenJPEG
+See also the files THANKS and CHANGES
+
+David Janssens designed and implemented the first version of OpenJPEG.
+Kaori Hagihara designed and implemented the first version of OpenJPIP.
+Jerome Fimes implemented the alpha version of OpenJPEG v2.
+Giuseppe Baruffa added the JPWL functionalities.
+Yannick Verschueren, 
+Herve Drolon, 
+Francois-Olivier Devaux, 
+Antonin Descampe
+    improved the libraries and utilities.
+
diff --git a/CHANGES b/CHANGES
index 89fba4df..9d45c00e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 August 16, 2011
++ [antonin] added NEWS, AUTHORS and THANKS files. Cosmetic changes in autotools files.
 - [antonin] removed obsolete testing directory and *.nix files
 * [antonin] fixed cmake support for openjpip
 
diff --git a/LICENSE b/LICENSE
index d1e5b6a5..48469dff 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2007, Professor Benoit Macq
- * Copyright (c) 2001-2003, David Janssens
- * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2011, Professor Benoit Macq
+ * Copyright (c) 2003-2011, Antonin Descampe
+ * Copyright (c) 2003-2009, Francois-Olivier Devaux
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2001-2003, David Janssens
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/NEWS b/NEWS
new file mode 100644
index 00000000..e774c75b
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,33 @@
+
+OpenJPEG NEWS - user visible changes
+====================================
+
+Changes from OpenJPEG 1.4.0 to OpenJPEG 1.5.0
+----------------------------------------------
+
+New Features:
+
+    * openjpip: 
+     - complete client-server architecture for remote browsing of jpeg 2000 images. 
+     - located in 'applications/jpip'.
+     - see corresponding README for more details.
+
+API modifications:
+
+    * 'bool' type has been replaced by 'opj_bool' type. 'stdbool.h' is no more required.
+    
+Misc:
+
+    * added this NEWS file.
+    * improved cmake and autotools build methods.
+    * removed manual makefiles, VS project files and XCode project files.
+    * added a 'thirdparty' directory to contain all dependencies.
+     - These libraries will be build only if there are not found on the system.
+     - Note that libopenjpeg itself does not have any dependency.
+    * changed the directory hierarchy of the whole project. See README files for details.
+    * tests : a complete test suite has been setup.
+     - both JPEG 2000 conformance tests and non-regressions tests are configured.
+     - results are submitted to the OpenJPEG dashboard (http://my.cdash.org/index.php?project=OPENJPEG)
+     - images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
+     - configuration files and utilities are located in 'tests' folder.
+    * Many bug fixes. See CHANGES for details.
\ No newline at end of file
diff --git a/README b/README
index 895b644d..05a280c2 100644
--- a/README
+++ b/README
@@ -15,9 +15,11 @@ Details on folders hierarchy:
     * OPJViewer: gui for displaying j2k files (based on wxWidget)
 * thirdparty: thirdparty libraries used by some applications. These libraries will be build only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
 * doc: doxygen documentation setup file and man pages
-* testing: all files required to test the library and executables (obsolete)
+* tests: configuration files and utilities for the openjpeg test suite. All test images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
 * CMake: cmake related files
 * m4: autotools related files
 
-see LICENSE for license and copyright information
-see INSTALL for installation procedures.
\ No newline at end of file
+see LICENSE for license and copyright information.
+see INSTALL for installation procedures.
+see NEWS for user visible changes in successive releases.
+see CHANGES for per-revision changes.
\ No newline at end of file
diff --git a/THANKS b/THANKS
new file mode 100644
index 00000000..4dd5e4fe
--- /dev/null
+++ b/THANKS
@@ -0,0 +1,32 @@
+OpenJPEG THANKS file
+
+Many people have contributed to OpenJPEG by reporting problems, suggesting various improvements,
+or submitting actual code. Here is a list of these people. Help me keep
+it complete and exempt of errors.
+
+Mathieu Malaterre
+Winfried Szukalski
+Vincent Torri
+Bob Friesenhahn
+Callum Lerwick
+Dzonatas Sol
+Mickaël Savinaud
+Julien Malik
+Jerôme Fimes
+Herve Drolon
+Yannick Verschueren
+Sebastien Lugan
+Kaori Hagihara
+Peter Wimmer
+Francois-Olivier Devaux
+Antonin Descampe
+David Janssens
+Pr. Benoit Macq
+Luis Ibanez
+Ben Boeckel
+Vincent Nicolas
+Glenn Pearson
+Giuseppe Baruffa
+Arnaud Maye
+Rex Dieter
+David Burken
diff --git a/applications/codec/Makefile.am b/applications/codec/Makefile.am
index 528c8640..10542b04 100644
--- a/applications/codec/Makefile.am
+++ b/applications/codec/Makefile.am
@@ -99,7 +99,7 @@ JPWL_image_to_j2k_CFLAGS =
 JPWL_image_to_j2k_LDADD = $(top_builddir)/libopenjpeg/jpwl/libopenjpeg_JPWL.la @TIFF_LIBS@ @PNG_LIBS@
 
 JPWL_image_to_j2k_SOURCES = \
-..//common/getopt.c \
+../common/getopt.c \
 index.c \
 convert.c \
 image_to_j2k.c
diff --git a/configure.ac b/configure.ac
index 4ee8e846..49d7b36e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_CONFIG_HEADERS([opj_config.h])
 AC_CANONICAL_SYSTEM
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE(1.11 foreign dist-bzip2)
+AM_INIT_AUTOMAKE(1[.11 foreign dist-bzip2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 MAJOR_NR=OPJ_MAJOR
@@ -375,6 +375,7 @@ AC_HEADER_DIRENT
 
 ### Checks for compiler characteristics
 
+AM_PROG_CC_C_O
 AC_C_BIGENDIAN
 
 #OPJ_COMPILER_FLAG([-Wall])
-- 
2.40.0