upgraded to OpenJPEG 2.5.2

README.md

@@ -1,11 +1,12 @@
 # JP2 for Android
 ---------------------------
-An open-source JPEG-2000 image encoder/decoder for Android based on [OpenJPEG](http://www.openjpeg.org/) v2.4.0.
+An open-source JPEG-2000 image encoder/decoder for Android based
+on [OpenJPEG](http://www.openjpeg.org/) v2.5.2.
 
 ## Set up
 Add dependency to your `build.gradle`:
 ```groovy
-implementation 'com.gemalto.jp2:jp2-android:1.0.3'
+implementation 'com.gemalto.jp2:jp2-android:1.0.4'
 ```
 
 ## Basic Usage

build.gradle

@@ -5,6 +5,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        maven { url "https://repo.grails.org/grails/core/" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -20,6 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://repo.grails.org/grails/core/" }
     }
 }
 

library/CMakeLists.txt

@@ -45,6 +45,8 @@ add_library( # Sets the name of the library.
              src/main/cpp/openjpeg/src/lib/openjp2/thix_manager.c
              src/main/cpp/openjpeg/src/lib/openjp2/thread.c
              src/main/cpp/openjpeg/src/lib/openjp2/tpix_manager.c
+        src/main/cpp/openjpeg/src/lib/openjp2/ht_dec.c
+        src/main/cpp/openjpeg/src/lib/openjp2/t1_ht_generate_luts.c
              src/main/cpp/openjpeg/src/bin/common/color.c
              src/main/cpp/openjpg.cpp
              )

library/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 30
-        versionName "1.0.3"
-        versionCode 4
+        versionName "1.0.4"
+        versionCode 5
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
@@ -25,6 +25,7 @@ android {
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
+            version "3.10.2.4988404"
         }
     }
     ndkVersion '22.0.7026061'

library/src/main/cpp/openjpeg/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,30 @@
+<!--
+IMPORTANT: Do NOT use GitHub to post any questions or support requests!
+           They will be closed immediately and ignored.
+
+Questions should go to the OpenJPEG mailing list at
+https://groups.google.com/g/openjpeg or other support forums.
+GitHub issues are for bug reports and suggestions for new features.
+
+The OpenJPEG project is made of contributions from various individuals and
+organizations, each with their own focus. The issue you are facing is
+not necessarily in the priority list of those contributors and consequently
+there is no guarantee that it will be addressed in a timely manner.
+
+-->
+
+## Expected behavior and actual behavior.
+
+...to fill...
+
+## Steps to reproduce the problem.
+
+...to fill...
+
+## Operating system
+
+...to fill...
+
+## openjpeg version
+
+...to fill...

library/src/main/cpp/openjpeg/.github/workflows/abi_check.yml

@@ -0,0 +1,24 @@
+name: ABI check
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  abi_check:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y gcc g++ libelf-dev elfutils texinfo exuberant-ctags libtiff-dev libwebp-dev libzstd-dev
+
+      - name: Build
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+          ./tools/travis-ci/abi-check.sh
+        env:
+          OPJ_CI_ABI_CHECK: 1

library/src/main/cpp/openjpeg/.github/workflows/build.yml

@@ -0,0 +1,189 @@
+name: Build
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  regular:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y gcc g++ libtiff-dev libwebp-dev libzstd-dev
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_ARCH: x86_64
+          OPJ_CI_BUILD_CONFIGURATION: Release
+          OPJ_CI_PERF_TESTS: 1
+          OPJ_CI_BUILD_FUZZERS: 1
+          OPJ_CI_INCLUDE_IF_DEPLOY: 1
+          OPJ_NONCOMMERCIAL: 1
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: build/openjpeg-*.tar.gz
+
+  asan:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y gcc g++ python-is-python3
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_ARCH: x86_64
+          OPJ_CI_BUILD_CONFIGURATION: Debug
+          OPJ_CI_ASAN: 1
+          OPJ_NONCOMMERCIAL: 1
+
+  clang_32bit:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y clang gcc-multilib
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_CC: clang
+          OPJ_CI_CXX: clang++
+          OPJ_CI_INSTRUCTION_SETS: "-mavx2"
+          OPJ_CI_BUILD_CONFIGURATION: Release
+          OPJ_CI_ARCH: i386
+          OPJ_NUM_THREADS: 2
+          OPJ_NONCOMMERCIAL: 1
+
+  mingw_64:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y gcc-mingw-w64-base binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 gcc-mingw-w64 g++-mingw-w64-x86-64
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_CC: x86_64-w64-mingw32-gcc
+          OPJ_CI_CXX: x86_64-w64-mingw32-g++
+          OPJ_CI_ARCH: x86_64
+          OPJ_CI_BUILD_CONFIGURATION: Release
+          OPJ_NONCOMMERCIAL: 1
+
+  macos:
+    runs-on: macos-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_ARCH: x86_64
+          OPJ_CI_BUILD_CONFIGURATION: Release
+          OPJ_CI_INCLUDE_IF_DEPLOY: 1
+          #OPJ_NONCOMMERCIAL: 1
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: build/openjpeg-*.zip
+
+  windows_build:
+    runs-on: windows-2019
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+
+    strategy:
+      matrix:
+        include:
+          - VS_VER: 2019
+            OPJ_CI_ARCH: x64
+            OPJ_CI_INCLUDE_IF_DEPLOY: 1
+          - VS_VER: 2019
+            OPJ_CI_ARCH: x86
+            OPJ_CI_INCLUDE_IF_DEPLOY: 1
+          - VS_VER: 2019
+            OPJ_CI_ARCH: x64
+            # We do have specific failures noted in tools/travis-ci/knownfailures-windows-vs2015-x64-avx2-Release-3rdP.txt
+            # not sure why that happens
+            OPJ_CI_INSTRUCTION_SETS: "/arch:AVX2"
+
+    env:
+      VS_VER: ${{ matrix.VS_VER }}
+      OPJ_CI_ARCH: ${{ matrix.OPJ_CI_ARCH }}
+      OPJ_CI_INCLUDE_IF_DEPLOY: ${{ matrix.OPJ_CI_INCLUDE_IF_DEPLOY }}
+      OPJ_CI_INSTRUCTION_SETS: ${{ matrix.OPJ_CI_INSTRUCTION_SETS }}
+      #OPJ_NONCOMMERCIAL: 1
+
+    steps:
+
+      - name: Setup git
+        run: |
+          git config --global core.autocrlf false
+          git config --system core.longpaths true
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set compiler environment
+        shell: cmd
+        run: |
+          if "%VS_VER%" == "2019" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%OPJ_CI_ARCH%
+          echo PATH=%PATH%>> %GITHUB_ENV%
+          echo INCLUDE=%INCLUDE%>> %GITHUB_ENV%
+          echo LIB=%LIB%>> %GITHUB_ENV%
+          echo LIBPATH=%LIBPATH%>> %GITHUB_ENV%
+
+      - name: Install wget
+        shell: cmd
+        run: |
+          choco install wget --no-progress 
+
+      - name: Build and run tests
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        shell: bash
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: ${{startsWith(github.ref, 'refs/tags/') && env.OPJ_CI_INCLUDE_IF_DEPLOY == 1}}
+        with:
+          files: build/openjpeg-*.zip

library/src/main/cpp/openjpeg/.github/workflows/cifuzz.yml

@@ -0,0 +1,26 @@
+name: CIFuzz
+on: [ pull_request ]
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build Fuzzers
+        id: build
+        uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+        with:
+          oss-fuzz-project-name: 'openjpeg'
+          dry-run: false
+          language: c
+      - name: Run Fuzzers
+        uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+        with:
+          oss-fuzz-project-name: 'openjpeg'
+          fuzz-seconds: 600
+          dry-run: false
+          language: c
+      - name: Upload Crash
+        uses: actions/upload-artifact@v1
+        if: failure() && steps.build.outcome == 'success'
+        with:
+          name: artifacts
+          path: ./out/artifacts

library/src/main/cpp/openjpeg/.github/workflows/code_style.yml

@@ -0,0 +1,26 @@
+name: Code Style
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  code_style:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Install Requirements
+        run: |
+          sudo apt update
+          sudo apt install -y gcc g++ flip
+
+      - name: Run check
+        run: |
+          ./tools/travis-ci/install.sh
+          ./tools/travis-ci/run.sh
+        env:
+          OPJ_CI_CHECK_STYLE: 1
+          OPJ_CI_SKIP_TESTS: 1