Merge branch 'master' into openjpeg-2.1

.travis.yml

@@ -21,10 +21,6 @@ matrix:
     - os: linux
       compiler: clang
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
-    - os: linux
-      compiler: clang-3.9
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
-      sudo: true
     - os: linux
       compiler: x86_64-w64-mingw32-gcc
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release

AUTHORS → AUTHORS.md

@@ -1,12 +1,18 @@
-Authors of OpenJPEG
-See also the files THANKS and CHANGES
+# Authors of OpenJPEG
+See also [THANKS](https://github.com/uclouvain/openjpeg/blob/master/THANKS.md)
 
 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 2.0.
+
 Giuseppe Baruffa added the JPWL functionalities.
-Micka�l Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
+
+Mickaël Savinaud implemented the final OpenJPEG 2.0 version based on a big merge between 1.5 version and alpha version of 2.0.
+
 Mathieu Malaterre participated to the OpenJPEG 2.0 version and improved the libraries and utilities. 
+
 Yannick Verschueren, 
 Herve Drolon, 
 Francois-Olivier Devaux, 

INSTALL.md

@@ -0,0 +1,75 @@
+
+# OpenJPEG installation
+
+The build method maintained by OpenJPEG is [CMake](https://cmake.org/).
+
+## UNIX/LINUX - MacOS (terminal) - WINDOWS (cygwin, MinGW)
+
+To build the library, type from source tree directory:
+```
+mkdir build
+cd build
+cmake ..
+make
+```
+Binaries are then located in the 'bin' directory.
+
+To install the library, type with root privileges:
+```
+make install
+make clean
+```
+
+To build the html documentation, you need doxygen to be installed on your system.
+It will create an "html" directory in TOP\_LEVEL/build/doc)
+```
+make doc
+```
+
+Main available cmake flags:
+  * To specify the install path: '-DCMAKE\_INSTALL\_PREFIX=/path'
+  * To build the shared libraries and links the executables against it: '-DBUILD\_SHARED\_LIBS:bool=on' (default: 'ON')
+> Note: when using this option, static libraries are not built and executables are dynamically linked.
+  * To build the CODEC executables: '-DBUILD\_CODEC:bool=on' (default: 'ON')
+  * [OBSOLETE] To build the MJ2 executables: '-DBUILD\_MJ2:bool=on' (default: 'OFF')
+  * [OBSOLETE] To build the JPWL executables and JPWL library: '-DBUILD\_JPWL:bool=on' (default: 'OFF')
+  * [OBSOLETE] To build the JPIP client (java compiler recommended) library and executables: '-DBUILD\_JPIP:bool=on' (default: 'OFF')
+  * [OBSOLETE] To build the JPIP server (need fcgi) library and executables: '-DBUILD\_JPIP\_SERVER:bool=on' (default: 'OFF')
+  * To enable testing (and automatic result upload to http://my.cdash.org/index.php?project=OPENJPEG):
+```
+cmake . -DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT:PATH='path/to/the/data/directory' -DBUILDNAME:STRING='name_of_the_build'
+make
+make Experimental
+```
+Note : test data is available on the following github repo: https://github.com/uclouvain/openjpeg-data
+
+If '-DOPJ\_DATA\_ROOT:PATH' option is omitted, test files will be automatically searched in '${CMAKE\_SOURCE\_DIR}/../data'.
+
+Note 2 : to execute the encoding test suite, kakadu binaries are needed to decode encoded image and compare it to the baseline. Kakadu binaries are freely available for non-commercial purposes at http://www.kakadusoftware.com. kdu\_expand will need to be in your PATH for cmake to find it.
+
+Note 3 : OpenJPEG encoder and decoder (not the library itself !) depends on several libraries: png, tiff, lcms, z. If these libraries are not found on the system, they are automatically built from the versions available in the source tree. You can force the use of these embedded version with BUILD\_THIRDPARTY:BOOL=ON. On a Debian-like system you can also simply install these libraries with:
+```
+sudo apt-get install liblcms2-dev  libtiff-dev libpng-dev libz-dev
+```
+
+Note 4 : On MacOS, if it does not work, try adding the following flag to the cmake command :
+```
+-DCMAKE_OSX_ARCHITECTURES:STRING=i386
+```
+
+## MacOS (XCode) - WINDOWS (VisualStudio, etc)
+
+You can use cmake to generate the project files for the IDE you are using (VC2010, XCode, etc).
+Type 'cmake --help' for available generators on your platform.
+
+# Using OpenJPEG
+
+To use openjpeg exported cmake file, simply create your application doing:
+
+```
+$ cat CMakeLists.txt
+find_package(OpenJPEG REQUIRED)
+include_directories(${OPENJPEG_INCLUDE_DIRS})
+add_executable(myapp myapp.c)
+target_link_libraries(myapp ${OPENJPEG_LIBRARIES})
+```

NEWS.md

@@ -0,0 +1,67 @@
+# OpenJPEG NEWS
+
+More details in the [Changelog](https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md)
+
+## OpenJPEG 2.1.1
+
+* Huge amount of critical bugfixes
+* Speed improvements
+* No API/ABI break compared to v2.1
+
+## OpenJPEG 2.1.0
+
+### New Features
+
+    * Digital Cinema profiles have been fixed and updated
+	* New option to disable MCT if needed
+    * extended RAW support: it is now possible to input raw images
+	  with subsampled color components (422, 420, etc)
+    * New way to deal with profiles
+	  
+### API/ABI modifications
+(see [here](http://www.openjpeg.org/abi-check/timeline/openjpeg/) for details)
+
+    * Removed deprecated functions 
+	    * opj_stream_create_default_file_stream(FILE*,...)
+        * opj_stream_create_file_stream(FILE*,...)
+        * opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data)
+	* Added 
+        * opj_stream_create_default_file_stream(char*,...)
+        * opj_stream_create_file_stream(char*,...)
+        * opj_stream_destroy(opj_stream_t*)
+        * opj_stream_set_user_data (opj_stream_t* p_stream, void * p_data, 
+            ... opj_stream_free_user_data_fn p_function)
+        * JPEG 2000 profiles and Part-2 extensions defined through '#define'
+    * Changed
+        * 'alpha' field added to 'opj_image_comp' structure
+        * 'OPJ_CLRSPC_EYCC' added to enum COLOR_SPACE
+        * 'OPJ_CLRSPC_CMYK' added to enum COLOR_SPACE
+        * 'OPJ_CODEC_JPP' and 'OPJ_CODEC_JPX' added to CODEC_FORMAT
+          (not yet used in use)
+        * 'max_cs_size' and 'rsiz' fields added to opj_cparameters_t
+
+### Misc
+
+    * OpenJPEG is now officially conformant with JPEG 2000 Part-1
+	  and will soon become official reference software at the 
+	  JPEG committee.
+	* Huge amount of bug fixes. See CHANGES for details.
+
+
+## OpenJPEG 2.0.0
+
+### New Features
+
+    * streaming capabilities
+    * merge JP3D
+
+### API modifications
+(see [here](http://www.openjpeg.org/abi-check/timeline/openjpeg/) for details)
+
+    * Use a 64bits capable API
+
+### Misc
+
+    * removed autotools build system
+    * folders hierarchies reorganisation
+    * Huge amount of bug fixes. See CHANGES for details.

README.md

@@ -52,12 +52,14 @@ The library is developed and maintained by the Image and Signal Processing Group
 
 See [LICENSE][link-license] for license and copyright information.
 
-See [INSTALL](https://github.com/uclouvain/openjpeg/blob/master/INSTALL) for installation procedures.
+See [INSTALL](https://github.com/uclouvain/openjpeg/blob/master/INSTALL.md) for installation procedures.
 
-See [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS) for user visible changes in successive releases.
+See [NEWS](https://github.com/uclouvain/openjpeg/blob/master/NEWS.md) for user visible changes in successive releases.
 
 ## API/ABI
 
+An API/ABI timeline is automatically updated [here][link-api-timeline].
+
 OpenJPEG strives to provide a stable API/ABI for your applications. As such it
 only exposes a limited subset of its functions.  It uses a mechanism of
 exporting/hiding functions. If you are unsure which functions you can use in
@@ -77,3 +79,4 @@ API available is the one supported by OpenJPEG.
 [link-msvc-build]: https://ci.appveyor.com/project/detonin/openjpeg/branch/openjpeg-2.1 "Windows Build Status"
 [badge-coverity]: https://scan.coverity.com/projects/6383/badge.svg "Coverity Scan Build Status"
 [link-coverity]: https://scan.coverity.com/projects/uclouvain-openjpeg "Coverity Scan Build Status"
+[link-api-timeline]: http://www.openjpeg.org/abi-check/timeline/openjpeg "OpenJPEG API/ABI timeline"

THANKS → THANKS.md

@@ -1,4 +1,4 @@
-OpenJPEG THANKS file
+# 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
@@ -24,10 +24,12 @@ Hans Johnson
 Callum Lerwick
 Sebastien Lugan
 Benoit Macq
-Arnaud Maye
+Mathieu Malaterre
 Julien Malik
+Arnaud Maye
 Vincent Nicolas
 Glenn Pearson
+Even Rouault
 Dzonatas Sol
 Winfried Szukalski
 Vincent Torri

src/lib/openjp3d/tcd.c

@@ -9,7 +9,7 @@
  * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
- * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
+ * Copyright (c) 2006, Mónica Díez, LPI-UVA, Spain
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1389,7 +1389,7 @@ bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_volume_i
 /* ----------------------------------------------------------------------- */
 int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_volume_info_t * volume_info) {
 	int compno;
-	int l, i, npck = 0;
+	int l = 0, i, npck = 0;
 	double encoding_time;
 
 	opj_tcd_tile_t	*tile = NULL;