Merge branch 'aous72:master' into feature/add-openexr-support

Author: michaeldsmith

src/core/CMakeLists.txt

@@ -38,8 +38,8 @@ if(EMSCRIPTEN)
   add_library(openjph ${SOURCES})
   add_library(openjphsimd ${SOURCES} ${CODESTREAM_WASM} ${CODING_WASM} ${TRANSFORM_WASM})
 
-  target_include_directories(openjph PUBLIC common)
-  target_include_directories(openjphsimd PUBLIC common)
+  target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
+  target_include_directories(openjphsimd PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
 
   target_compile_options(openjphsimd PRIVATE -DOJPH_ENABLE_WASM_SIMD -msimd128)
 
@@ -124,7 +124,7 @@ if (BUILD_SHARED_LIBS AND WIN32)
 endif()
 
 ## include library version/name
-target_include_directories(openjph PUBLIC common)
+target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
 target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
 
 if (MSVC)

src/core/codestream/ojph_params.cpp

@@ -951,6 +951,34 @@ namespace ojph {
     //
     //////////////////////////////////////////////////////////////////////////
 
+    //////////////////////////////////////////////////////////////////////////
+    void param_qcd::check_validity(const param_siz& siz, const param_cod& cod)
+    {
+      ui32 num_decomps = cod.get_num_decompositions();
+      num_subbands = 1 + 3 * num_decomps;
+      if (cod.get_wavelet_kern() == param_cod::DWT_REV53)
+      {
+        ui32 bit_depth = 0;
+        for (ui32 i = 0; i < siz.get_num_components(); ++i)
+          bit_depth = ojph_max(bit_depth, siz.get_bit_depth(i));
+        set_rev_quant(num_decomps, bit_depth,
+          cod.is_employing_color_transform());
+      }
+      else if (cod.get_wavelet_kern() == param_cod::DWT_IRV97)
+      {
+        if (base_delta == -1.0f) {
+          ui32 bit_depth = 0;
+          for (ui32 i = 0; i < siz.get_num_components(); ++i)
+            bit_depth =
+            ojph_max(bit_depth, siz.get_bit_depth(i) + siz.is_signed(i));
+          base_delta = 1.0f / (float)(1 << bit_depth);
+        }
+        set_irrev_quant(num_decomps);
+      }
+      else
+        assert(0);
+    }
+
     //////////////////////////////////////////////////////////////////////////
     void param_qcd::set_rev_quant(ui32 num_decomps, ui32 bit_depth,
                                   bool is_employing_color_transform)

src/core/codestream/ojph_params_local.h

@@ -442,7 +442,8 @@ namespace ojph {
         }
 
         //check the progression order matches downsampling
-        if (SGCod.prog_order == 2 || SGCod.prog_order == 3)
+        if (SGCod.prog_order == OJPH_PO_RPCL ||
+            SGCod.prog_order == OJPH_PO_PCRL)
         {
           ui32 num_comps = siz.get_num_components();
           for (ui32 i = 0; i < num_comps; ++i)
@@ -606,33 +607,8 @@ namespace ojph {
       }
 
       void set_delta(float delta) { base_delta = delta; }
+      void check_validity(const param_siz& siz, const param_cod& cod);
 
-      void check_validity(const param_siz& siz, const param_cod& cod)
-      {
-        ui32 num_decomps = cod.get_num_decompositions();
-        num_subbands = 1 + 3 * num_decomps;
-        if (cod.get_wavelet_kern() == param_cod::DWT_REV53)
-        {
-          ui32 bit_depth = 0;
-          for (ui32 i = 0; i < siz.get_num_components(); ++i)
-            bit_depth = ojph_max(bit_depth, siz.get_bit_depth(i));
-          set_rev_quant(num_decomps, bit_depth,
-            cod.is_employing_color_transform());
-        }
-        else if (cod.get_wavelet_kern() == param_cod::DWT_IRV97)
-        {
-          if (base_delta == -1.0f) {
-            ui32 bit_depth = 0;
-            for (ui32 i = 0; i < siz.get_num_components(); ++i)
-              bit_depth =
-              ojph_max(bit_depth, siz.get_bit_depth(i) + siz.is_signed(i));
-            base_delta = 1.0f / (float)(1 << bit_depth);
-          }
-          set_irrev_quant(num_decomps);
-        }
-        else
-          assert(0);
-      }
       ui32 get_num_guard_bits() const;
       ui32 get_MAGBp() const;
       ui32 get_Kmax(const param_dfs* dfs, ui32 num_decompositions,