Merge branch 'feature/add-openexr-support' of https://github.com/michaeldsmith/OpenJPH into feature/add-openexr-support

Author: michaeldsmith

src/core/codestream/ojph_codeblock.cpp

@@ -64,7 +64,7 @@ namespace ojph {
 
       const param_siz* sz = codestream->get_siz();
       const param_cod* cd = codestream->get_cod(comp_num);
-      ui32 precision = cd->propose_implementation_precision(sz);
+      ui32 precision = cd->propose_precision(sz, comp_num);
       if (precision <= 32)
         allocator->pre_alloc_data<ui32>(nominal.h * (size_t)stride, 0);
       else
@@ -87,7 +87,7 @@ namespace ojph {
       ui32 comp_num = parent->get_parent()->get_comp_num();
       const param_siz* sz = codestream->get_siz();
       const param_cod* cd = codestream->get_cod(comp_num);
-      ui32 bit_depth = cd->propose_implementation_precision(sz);
+      ui32 bit_depth = cd->propose_precision(sz, comp_num);
       if (bit_depth <= 32) {
         precision = BUF32;
         this->buf32 = allocator->post_alloc_data<ui32>(this->buf_size, 0);

src/core/codestream/ojph_codeblock_fun.cpp

@@ -158,6 +158,8 @@ namespace ojph {
         tx_from_cb64 = NULL;
       }
       encode_cb64 = ojph_encode_codeblock64;
+      bool result = initialize_block_encoder_tables();
+      assert(result); ojph_unused(result);      
 
   #ifndef OJPH_DISABLE_SIMD
 

src/core/codestream/ojph_params.cpp

@@ -778,7 +778,7 @@ namespace ojph {
 
     //////////////////////////////////////////////////////////////////////////
     ui32 
-    param_cod::propose_implementation_precision(const param_siz* siz) const
+    param_cod::propose_precision(const param_siz* siz, ui32 comp_num) const
     {
       bool employing_color_transform = is_employing_color_transform() ? 1 : 0;
       bool reversible = atk->is_reversible();

src/core/codestream/ojph_params_local.h

@@ -524,7 +524,7 @@ namespace ojph {
       }
 
       ////////////////////////////////////////
-      ui32 propose_implementation_precision(const param_siz* siz) const;
+      ui32 propose_precision(const param_siz* siz, ui32 comp_num) const;
 
       ////////////////////////////////////////
       bool write(outfile_base *file);
@@ -578,11 +578,11 @@ namespace ojph {
       cod_SGcod SGCod;      // Used in COD and copied to COC
       cod_SPcod SPcod;      // serves as SPcod and SPcoc
       const param_cod* next;// to chain coc parameters to cod
+      const param_atk* atk; // used to read transform information
 
     private: // COC only variables
       param_cod* parent;    // parent COD structure
       ui16 comp_num;        // component index of this COC structure
-      const param_atk* atk; // useful when SPcod.wavelet_trans > 1
     };
 
     ///////////////////////////////////////////////////////////////////////////

src/core/codestream/ojph_resolution.cpp

@@ -200,7 +200,7 @@ namespace ojph {
       }
 
       const param_siz* szp = codestream->get_siz();
-      ui32 precision = cdp->propose_implementation_precision(szp);
+      ui32 precision = cdp->propose_precision(szp, comp_num);
 
       //allocate lines
       if (skipped_res_for_recon == false)
@@ -449,7 +449,7 @@ namespace ojph {
       cur_precinct_loc = point(0, 0);
 
       const param_siz* szp = codestream->get_siz();
-      ui32 precision = cdp->propose_implementation_precision(szp);
+      ui32 precision = cdp->propose_precision(szp, comp_num);
 
       //allocate lines
       if (skipped_res_for_recon == false)

src/core/codestream/ojph_subband.cpp

@@ -98,7 +98,7 @@ namespace ojph {
       //allocate line_buf
       ui32 width = band_rect.siz.w + 1;
       const param_siz* szp = codestream->get_siz();
-      ui32 precision = cdp->propose_implementation_precision(szp);
+      ui32 precision = cdp->propose_precision(szp, comp_num);
       if (precision <= 32)      
         allocator->pre_alloc_data<si32>(width, 1);
       else
@@ -141,7 +141,8 @@ namespace ojph {
         if (dfs != NULL)
           dfs = dfs->get_dfs(cdp->get_dfs_index());
       }
-      param_qcd* qcd = codestream->access_qcd(parent->get_comp_num());
+      ui32 comp_num = parent->get_comp_num();
+      param_qcd* qcd = codestream->access_qcd(comp_num);
       ui32 num_decomps = cdp->get_num_decompositions();
       this->K_max = qcd->get_Kmax(dfs, num_decomps, this->res_num, band_num);
       if (!reversible)
@@ -198,7 +199,7 @@ namespace ojph {
       //allocate line_buf
       ui32 width = band_rect.siz.w + 1;
       const param_siz* szp = codestream->get_siz();
-      ui32 precision = cdp->propose_implementation_precision(szp);
+      ui32 precision = cdp->propose_precision(szp, comp_num);
       if (precision <= 32)      
         lines->wrap(allocator->post_alloc_data<si32>(width, 1), width, 1);
       else

src/core/coding/ojph_block_decoder32.cpp

@@ -578,7 +578,7 @@ namespace ojph {
     /** @brief State structure for reading and unstuffing of forward-growing 
      *         bitstreams; these are: MagSgn and SPP bitstreams
      */
-    struct frwd_struct {
+    struct frwd_struct32 {
       const ui8* data;  //!<pointer to bitstream
       ui64 tmp;         //!<temporary buffer of read data
       ui32 bits;        //!<number of bits stored in tmp
@@ -601,12 +601,12 @@ namespace ojph {
      *  Reading can go beyond the end of buffer by up to 3 bytes.
      *
      *  @tparam       X is the value fed in when the bitstream is exhausted
-     *  @param  [in]  msp is a pointer to frwd_struct structure
+     *  @param  [in]  msp is a pointer to frwd_struct32 structure
      *
      */ 
     template<int X>
     static inline 
-    void frwd_read(frwd_struct *msp)
+    void frwd_read(frwd_struct32 *msp)
     {
       assert(msp->bits <= 32); // assert that there is a space for 32 bits
 
@@ -653,17 +653,17 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Initialize frwd_struct struct and reads some bytes
+    /** @brief Initialize frwd_struct32 struct and reads some bytes
      *  
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct32
      *  @param [in]  data is a pointer to the start of data
      *  @param [in]  size is the number of byte in the bitstream
      */
     template<int X>
     static inline
-    void frwd_init(frwd_struct *msp, const ui8* data, int size)
+    void frwd_init(frwd_struct32 *msp, const ui8* data, int size)
     {
       msp->data = data;
       msp->tmp = 0;
@@ -689,29 +689,29 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Consume num_bits bits from the bitstream of frwd_struct
+    /** @brief Consume num_bits bits from the bitstream of frwd_struct32
      *
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct32
      *  @param [in]  num_bits is the number of bit to consume
      */
     static inline 
-    void frwd_advance(frwd_struct *msp, ui32 num_bits)
+    void frwd_advance(frwd_struct32 *msp, ui32 num_bits)
     {
       assert(num_bits <= msp->bits);
       msp->tmp >>= num_bits;  // consume num_bits
       msp->bits -= num_bits;
     }
 
     //************************************************************************/
-    /** @brief Fetches 32 bits from the frwd_struct bitstream
+    /** @brief Fetches 32 bits from the frwd_struct32 bitstream
      *
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct32
      */
     template<int X>
     static inline 
-    ui32 frwd_fetch(frwd_struct *msp)
+    ui32 frwd_fetch(frwd_struct32 *msp)
     {
       if (msp->bits < 32)
       {
@@ -1099,7 +1099,7 @@ namespace ojph {
         const int v_n_size = 512 + 4;
         ui32 v_n_scratch[v_n_size] = {0};  // 2+ kB
 
-        frwd_struct magsgn;
+        frwd_struct32 magsgn;
         frwd_init<0xFF>(&magsgn, coded_data, lcup - scup);
 
         ui16 *sp = scratch;
@@ -1368,7 +1368,7 @@ namespace ojph {
           // We add an extra 8 entries, just in case we need more
           ui16 prev_row_sig[256 + 8] = {0}; // 528 Bytes
 
-          frwd_struct sigprop;
+          frwd_struct32 sigprop;
           frwd_init<0>(&sigprop, coded_data + lengths1, (int)lengths2);
 
           for (ui32 y = 0; y < height; y += 4)

src/core/coding/ojph_block_decoder64.cpp

@@ -530,7 +530,7 @@ namespace ojph {
     /** @brief State structure for reading and unstuffing of forward-growing 
      *         bitstreams; these are: MagSgn and SPP bitstreams
      */
-    struct frwd_struct {
+    struct frwd_struct64 {
       const ui8* data;  //!<pointer to bitstream
       ui64 tmp;         //!<temporary buffer of read data
       ui32 bits;        //!<number of bits stored in tmp
@@ -553,12 +553,12 @@ namespace ojph {
      *  Reading can go beyond the end of buffer by up to 3 bytes.
      *
      *  @tparam       X is the value fed in when the bitstream is exhausted
-     *  @param  [in]  msp is a pointer to frwd_struct structure
+     *  @param  [in]  msp is a pointer to frwd_struct64 structure
      *
      */ 
     template<int X>
     static inline 
-    void frwd_read(frwd_struct *msp)
+    void frwd_read(frwd_struct64 *msp)
     {
       assert(msp->bits <= 32); // assert that there is a space for 32 bits
 
@@ -617,12 +617,12 @@ namespace ojph {
      *  MSB of the next byte is set 0 and must be ignored during decoding.
      *
      *  @tparam       X is the value fed in when the bitstream is exhausted
-     *  @param  [in]  msp is a pointer to frwd_struct structure
+     *  @param  [in]  msp is a pointer to frwd_struct64 structure
      *
      */ 
     template<ui8 X>
     static inline 
-    void frwd_read8(frwd_struct *msp)
+    void frwd_read8(frwd_struct64 *msp)
     {
       ui8 val = X;
       if (msp->size > 0) {
@@ -640,17 +640,17 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Initialize frwd_struct struct and reads some bytes
+    /** @brief Initialize frwd_struct64 struct and reads some bytes
      *  
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct64
      *  @param [in]  data is a pointer to the start of data
      *  @param [in]  size is the number of byte in the bitstream
      */
     template<int X>
     static inline
-    void frwd_init(frwd_struct *msp, const ui8* data, int size)
+    void frwd_init(frwd_struct64 *msp, const ui8* data, int size)
     {
       msp->data = data;
       msp->tmp = 0;
@@ -676,17 +676,17 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Initialize frwd_struct struct and reads some bytes
+    /** @brief Initialize frwd_struct64 struct and reads some bytes
      *  
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct64
      *  @param [in]  data is a pointer to the start of data
      *  @param [in]  size is the number of byte in the bitstream
      */
     template<ui8 X>
     static inline
-    void frwd_init8(frwd_struct *msp, const ui8* data, int size)
+    void frwd_init8(frwd_struct64 *msp, const ui8* data, int size)
     {
       msp->data = data;
       msp->tmp = 0;
@@ -697,29 +697,29 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Consume num_bits bits from the bitstream of frwd_struct
+    /** @brief Consume num_bits bits from the bitstream of frwd_struct64
      *
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct64
      *  @param [in]  num_bits is the number of bit to consume
      */
     static inline 
-    void frwd_advance(frwd_struct *msp, ui32 num_bits)
+    void frwd_advance(frwd_struct64 *msp, ui32 num_bits)
     {
       assert(num_bits <= msp->bits);
       msp->tmp >>= num_bits;  // consume num_bits
       msp->bits -= num_bits;
     }
 
     //************************************************************************/
-    /** @brief Fetches 32 bits from the frwd_struct bitstream
+    /** @brief Fetches 32 bits from the frwd_struct64 bitstream
      *
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct64
      */
     template<int X>
     static inline 
-    ui32 frwd_fetch(frwd_struct *msp)
+    ui32 frwd_fetch(frwd_struct64 *msp)
     {
       if (msp->bits < 32)
       {
@@ -731,15 +731,15 @@ namespace ojph {
     }
 
     //************************************************************************/
-    /** @brief Fetches up to 64 bits from the frwd_struct bitstream
+    /** @brief Fetches up to 64 bits from the frwd_struct64 bitstream
      *
      *  @tparam      X is the value fed in when the bitstream is exhausted.
      *               See frwd_read regarding the template
-     *  @param [in]  msp is a pointer to frwd_struct
+     *  @param [in]  msp is a pointer to frwd_struct64
      */
     template<ui8 X>
     static inline 
-    ui64 frwd_fetch64(frwd_struct *msp)
+    ui64 frwd_fetch64(frwd_struct64 *msp)
     {
       while (msp->bits <= 56)
         frwd_read8<X>(msp);
@@ -1147,7 +1147,7 @@ namespace ojph {
         const int v_n_size = 512 + 4;
         ui64 v_n_scratch[v_n_size] = {0};  // 4+ kB
 
-        frwd_struct magsgn;
+        frwd_struct64 magsgn;
         frwd_init8<0xFF>(&magsgn, coded_data, lcup - scup);
 
         const ui16 *sp = scratch;
@@ -1415,7 +1415,7 @@ namespace ojph {
           // We add an extra 8 entries, just in case we need more
           ui16 prev_row_sig[256 + 8] = {0}; // 528 Bytes
 
-          frwd_struct sigprop;
+          frwd_struct64 sigprop;
           frwd_init<0>(&sigprop, coded_data + lengths1, (int)lengths2);
 
           for (ui32 y = 0; y < height; y += 4)