Upgrade Kakadu to 8.0.3 (closes cantaloupe-project#357)

Author: Alex Dolski

CHANGES.md

@@ -37,6 +37,8 @@
     * XMP metadata can be copied or edited using a delegate method.
     * The `processor.metadata.respect_orientation` configuration key has been
       removed and EXIF Orientation values are always respected.
+* The included Kakadu library used by KakaduNativeProcessor has been updated
+  to version 8.0.3.
 * KakaduNativeProcessor, OpenJpegProcessor, and TurboJpegProcessor respect the
   EXIF `Orientation` tag.
 * KakaduNativeProcessor and OpenJpegProcessor support IPTC and XMP metadata.

UPGRADING.md

@@ -41,9 +41,11 @@ current version.
 10. Note that the IIIF Image API 1.x endpoint no longer supports content
     negotiation. If a format extension is not supplied in the URI, JPEG will be
     returned regardless of the value of the `Accept` header.
-11. KakaduDemoProcessor is no longer available. If you were using it, you must
+11. If you are using KakaduNativeProcessor, you must install the updated Kakadu
+    shared library, contained in the `deps` folder.
+12. KakaduDemoProcessor is no longer available. If you were using it, you must
     switch to either OpenJpegProcessor or KakaduNativeProcessor.
-12. Note that the `false` value supplied to the `cache` URL query argument
+13. Note that the `false` value supplied to the `cache` URL query argument
     (e.g. `?cache=false`) has been replaced by `nocache`. `false` can still be
     used, but it is deprecated and may be removed in a future version.
 

dist/deps/Linux-x86-64/lib/libkdu_a7AR.so

@@ -19,14 +19,15 @@ document for detailed terms of use.
 The Linux binaries were compiled on CentOS 7 x86 64-bit with gcc 4.8.5.
 
 ```
+export JAVA_HOME=/usr/lib/jvm/java
 cd coresys/make
 make -f Makefile-Linux-x86-64-gcc
 cd ../../managed/make
 make -f Makefile-Linux-x86-64-gcc
 cd ../../lib/Linux-x86-64-gcc
 
-# Builds libkdu_vNXX.so & libkdu_jni.so
-# Java class files are in ../../../java/kdu_jni
+# Builds `libkdu_vNXX.so` & `libkdu_jni.so`
+# Java class files are in `../../../java/kdu_jni`
 ```
 
 ## macOS
@@ -43,6 +44,9 @@ xcodebuild -project managed.xcodeproj -target kdu_jni -configuration Release
 # Java class files are in ../../java/kdu_jni
 ```
 
+(Future note: for Catalina, add `-UseModernBuildSystem=NO` to the `xcodebuild`
+commands.)
+
 ## Windows
 
 The Windows binaries were compiled on Windows 7 SP1 64-bit with Visual
@@ -62,11 +66,12 @@ Studio Community 2015.
     2. Add the JDK headers to the include path
         1. Right-click on the `kdu_jni` solution
         2. Go to Properties -> VC++ Directories -> Include Directories
-        3. Add path to JDK headers
+        3. Add `jdk-x.x.x\include` and `jdk-x.x.x\include\win32` paths to JDK
+           headers
     3. Retarget solution to the 8.1 platform version
     4. Build with Release configuration & x64 platform
 
 The resulting files are in `..\..\bin_x64`:
-  * `kdu_v7AR.dll`
-  * `kdu_a7AR.dll`
+  * `kdu_v80R.dll`
+  * `kdu_a80R.dll`
   * `kdu_jni.dll`

dist/deps/Linux-x86-64/lib/libkdu_a80R.so

@@ -16,4 +16,8 @@ public void finalize() {
         Native_destroy();
       }
   }
+  private static native long Native_create();
+  public Ads_params() {
+    this(Native_create());
+  }
 }

dist/deps/Linux-x86-64/lib/libkdu_jni.so

@@ -16,5 +16,9 @@ public void finalize() {
         Native_destroy();
       }
   }
+  private static native long Native_create();
+  public Atk_params() {
+    this(Native_create());
+  }
   public native boolean Is_predef_kernel_symmetric(int _kernel_idx) throws KduException;
 }

dist/deps/Linux-x86-64/lib/libkdu_v7AR.so

@@ -16,6 +16,10 @@ public void finalize() {
         Native_destroy();
       }
   }
+  private static native long Native_create();
+  public Cod_params() {
+    this(Native_create());
+  }
   public native boolean Is_valid_decomp_terminator(int _val) throws KduException;
   public native int Transpose_decomp(int _val) throws KduException;
   public native int Expand_decomp_bands(int _decomp_val, short[] _band_descriptors) throws KduException;

dist/deps/Linux-x86-64/lib/libkdu_v80R.so

@@ -16,4 +16,8 @@ public void finalize() {
         Native_destroy();
       }
   }
+  private static native long Native_create();
+  public Crg_params() {
+    this(Native_create());
+  }
 }

dist/deps/README.md

@@ -16,4 +16,8 @@ public void finalize() {
         Native_destroy();
       }
   }
+  private static native long Native_create();
+  public Dfs_params() {
+    this(Native_create());
+  }
 }

dist/deps/Windows-x86-64/lib/kdu_a7AR.dll

@@ -16,13 +16,34 @@ public Jp2_channels() {
       this(0,0);
   }
   public native boolean Exists() throws KduException;
-  public native void Copy(Jp2_channels _src) throws KduException;
-  public native void Init(int _num_colours) throws KduException;
+  public native void Copy(Jp2_channels _src, int[] _stream_map, int _stream_map_elts, int _stream_base) throws KduException;
+  public void Copy(Jp2_channels _src) throws KduException
+  {
+    Copy(_src,null,(int) 0,(int) 0);
+  }
+  public void Copy(Jp2_channels _src, int[] _stream_map) throws KduException
+  {
+    Copy(_src,_stream_map,(int) 0,(int) 0);
+  }
+  public void Copy(Jp2_channels _src, int[] _stream_map, int _stream_map_elts) throws KduException
+  {
+    Copy(_src,_stream_map,_stream_map_elts,(int) 0);
+  }
+  public native void Init(int _num_colours, int _num_non_colours) throws KduException;
+  public void Init(int _num_colours) throws KduException
+  {
+    Init(_num_colours,(int) 0);
+  }
   public native boolean Set_colour_mapping(int _colour_idx, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format, int[] _format_params) throws KduException;
   public boolean Set_colour_mapping(int _colour_idx, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format) throws KduException
   {
     return Set_colour_mapping(_colour_idx,_codestream_component,_lut_idx,_codestream_idx,_data_format,null);
   }
+  public native boolean Set_non_colour_mapping(int _idx, int _asoc_key, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format, int[] _format_params) throws KduException;
+  public boolean Set_non_colour_mapping(int _idx, int _asoc_key, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format) throws KduException
+  {
+    return Set_non_colour_mapping(_idx,_asoc_key,_codestream_component,_lut_idx,_codestream_idx,_data_format,null);
+  }
   public native boolean Set_opacity_mapping(int _colour_idx, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format, int[] _format_params) throws KduException;
   public boolean Set_opacity_mapping(int _colour_idx, int _codestream_component, int _lut_idx, int _codestream_idx, int _data_format) throws KduException
   {
@@ -35,11 +56,26 @@ public boolean Set_premult_mapping(int _colour_idx, int _codestream_component, i
   }
   public native boolean Set_chroma_key(int _colour_idx, int _key_val) throws KduException;
   public native int Get_num_colours() throws KduException;
+  public native int Get_num_non_colours() throws KduException;
+  public native int Get_codestreams_used(int[] _min_stream_idx, int[] _max_stream_idx, int[] _stream_indices, int _max_indices) throws KduException;
+  public int Get_codestreams_used(int[] _min_stream_idx, int[] _max_stream_idx) throws KduException
+  {
+    return Get_codestreams_used(_min_stream_idx,_max_stream_idx,null,(int) 0);
+  }
+  public int Get_codestreams_used(int[] _min_stream_idx, int[] _max_stream_idx, int[] _stream_indices) throws KduException
+  {
+    return Get_codestreams_used(_min_stream_idx,_max_stream_idx,_stream_indices,(int) 0);
+  }
   public native boolean Get_colour_mapping(int _colour_idx, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format, int[] _format_params) throws KduException;
   public boolean Get_colour_mapping(int _colour_idx, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format) throws KduException
   {
     return Get_colour_mapping(_colour_idx,_codestream_component,_lut_idx,_codestream_idx,_data_format,null);
   }
+  public native boolean Get_non_colour_mapping(int _idx, int[] _asoc_key, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format, int[] _format_params) throws KduException;
+  public boolean Get_non_colour_mapping(int _idx, int[] _asoc_key, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format) throws KduException
+  {
+    return Get_non_colour_mapping(_idx,_asoc_key,_codestream_component,_lut_idx,_codestream_idx,_data_format,null);
+  }
   public native boolean Get_opacity_mapping(int _colour_idx, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format, int[] _format_params) throws KduException;
   public boolean Get_opacity_mapping(int _colour_idx, int[] _codestream_component, int[] _lut_idx, int[] _codestream_idx, int[] _data_format) throws KduException
   {

dist/deps/Windows-x86-64/lib/kdu_a80R.dll

@@ -45,6 +45,8 @@ public void Init(double[] _xy_red, double[] _xy_green, double[] _xy_blue, double
   {
     Init(_xy_red,_xy_green,_xy_blue,_gamma,_beta,_num_points,(boolean) false);
   }
+  public native boolean Is_jp2_compatible() throws KduException;
+  public native boolean Is_jph_compatible() throws KduException;
   public native int Get_num_colours() throws KduException;
   public native int Get_space() throws KduException;
   public native boolean Is_opponent_space() throws KduException;

dist/deps/Windows-x86-64/lib/kdu_jni.dll

@@ -22,14 +22,16 @@ public void Init(Siz_params _siz) throws KduException
     Init(_siz,(boolean) true);
   }
   public native void Finalize_compatibility(Kdu_params _root) throws KduException;
-  public native void Finalize_compatibility(int _profile, boolean _is_jpx_baseline) throws KduException;
+  public native void Finalize_compatibility(int _profile, int _scap_val, int _extensions, int _mct_attributes, int _part2_caps) throws KduException;
   public native void Finalize_compatibility(Jp2_dimensions _src) throws KduException;
   public native boolean Set_precision(int _component_idx, int _bit_depth, boolean _is_signed) throws KduException;
   public boolean Set_precision(int _component_idx, int _bit_depth) throws KduException
   {
     return Set_precision(_component_idx,_bit_depth,(boolean) false);
   }
   public native void Set_ipr_box_available() throws KduException;
+  public native boolean Is_jp2_compatible(boolean _result_if_unknown) throws KduException;
+  public native boolean Is_jph_compatible(boolean _result_if_unknown) throws KduException;
   public native Kdu_coords Get_size() throws KduException;
   public native int Get_num_components() throws KduException;
   public native boolean Colour_space_known() throws KduException;

dist/deps/Windows-x86-64/lib/kdu_v7AR.dll

@@ -20,7 +20,12 @@ public void finalize() {
   public Jp2_source() {
     this(Native_create());
   }
-  public native boolean Read_header() throws KduException;
+  public native int Read_header(boolean _return_if_incompatible) throws KduException;
+  public int Read_header() throws KduException
+  {
+    return Read_header((boolean) false);
+  }
+  public native long Get_brand() throws KduException;
   public native long Get_header_bytes() throws KduException;
   public native Jp2_dimensions Access_dimensions() throws KduException;
   public native Jp2_palette Access_palette() throws KduException;

dist/deps/Windows-x86-64/lib/kdu_v80R.dll

@@ -37,6 +37,7 @@ public void Open(Jp2_output_box _super_box, long _box_type) throws KduException
     Open(_super_box,_box_type,(boolean) false);
   }
   public native boolean Close_box() throws KduException;
+  public native long Get_brand() throws KduException;
   public native void Write_header() throws KduException;
   public native void Open_codestream(boolean _rubber_length) throws KduException;
   public void Open_codestream() throws KduException

dist/deps/macOS-x86-64/lib/libkdu_a7AR.dylib

@@ -15,7 +15,9 @@ public Jpx_compatibility() {
   }
   public native boolean Exists() throws KduException;
   public native boolean Is_jp2() throws KduException;
+  public native long Get_brand() throws KduException;
   public native boolean Is_jp2_compatible() throws KduException;
+  public native boolean Is_jph_compatible() throws KduException;
   public native boolean Is_jpxb_compatible() throws KduException;
   public native boolean Has_reader_requirements_box() throws KduException;
   public native boolean Check_standard_feature(int _feature_id) throws KduException;