Add HTJ2K Compressor support to Tiled images

Author: palemieux

src/lib/OpenEXR/ImfCompressor.cpp

@@ -421,6 +421,13 @@ newTileCompressor (
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
+        case HTJ2K_COMPRESSION:
+
+            return new HTCompressor (
+                hdr,
+                static_cast<int> (tileLineSize),
+                static_cast<int> (numTileLines));
+
         default: break;
     }
     // clang-format on

src/lib/OpenEXRCore/internal_ht.cpp

@@ -73,7 +73,7 @@ class MemoryWriter
     void push_uint32 (uint32_t value)
     {
         if (this->end - this->cur < 4)
-            throw std::out_of_range ("Insufficient data to push uint32_t");
+            throw std::range_error ("Insufficient data to push uint32_t");
 
         *this->cur++ = (value >> 24) & 0xFF;
         *this->cur++ = (value >> 16) & 0xFF;
@@ -84,7 +84,7 @@ class MemoryWriter
     void push_uint16 (uint16_t value)
     {
         if (this->end - this->cur < 2)
-            throw std::out_of_range ("Insufficient data to push uint32_t");
+            throw std::range_error ("Insufficient data to push uint32_t");
 
         *this->cur++ = (value >> 8) & 0xFF;
         *this->cur++ = value & 0xFF;
@@ -153,8 +153,8 @@ read_header (
  * OpenJPH output file that is backed by a fixed-size memory buffer
  */
 class staticmem_outfile : public ojph::outfile_base
-  {
-  public:
+{
+public:
     /**  A constructor */
     staticmem_outfile() {
         is_open = false;
@@ -197,7 +197,6 @@ class staticmem_outfile : public ojph::outfile_base
     size_t write (const void* ptr, size_t sz)
     {
         assert (this->is_open);
-        assert (this->max_size);
         assert (this->buf);
         assert (this->cur_ptr);
 
@@ -281,13 +280,13 @@ class staticmem_outfile : public ojph::outfile_base
      */
     size_t get_size() const { return this->used_size; }
 
-  private:
+private:
     bool is_open;
     size_t max_size;
     size_t used_size;
     ojph::ui8 *buf;
     ojph::ui8 *cur_ptr;
-  };
+};
 
 extern "C" exr_result_t
 internal_exr_undo_ht (
@@ -515,17 +514,18 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
     cod.set_block_dims (128, 32);
     cod.set_num_decomposition (5);
 
-    /* write the header */
-    size_t header_sz = write_header (
-        (uint8_t*) encode->compressed_buffer,
-        encode->packed_bytes,
-        cs_to_file_ch);
+    try
+    {
+        /* write the header */
+        size_t header_sz = write_header (
+            (uint8_t*) encode->compressed_buffer,
+            encode->packed_bytes,
+            cs_to_file_ch);
 
-    /* write the codestream */
-    staticmem_outfile output;
-    output.open ( ((uint8_t*) encode->compressed_buffer) + header_sz, encode->packed_bytes - header_sz);
+        /* write the codestream */
+        staticmem_outfile output;
+        output.open ( ((uint8_t*) encode->compressed_buffer) + header_sz, encode->packed_bytes - header_sz);
 
-        try {
         cs.write_headers (&output);
 
         ojph::ui32      next_comp = 0;
@@ -542,11 +542,11 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                 int file_c = cs_to_file_ch[c].file_index;
 
                 for (int64_t y = encode->chunk.start_y;
-                    y < image_height + encode->chunk.start_y;
-                    y++)
+                     y < image_height + encode->chunk.start_y;
+                     y++)
                 {
                     for (ojph::ui32 line_c = 0; line_c < encode->channel_count;
-                        line_c++)
+                         line_c++)
                     {
 
                         if (y % encode->channels[line_c].y_samples != 0) continue;
@@ -558,8 +558,8 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                             {
                                 int16_t* channel_pixels = (int16_t*) (line_pixels);
                                 for (uint32_t p = 0;
-                                    p < encode->channels[file_c].width;
-                                    p++)
+                                     p < encode->channels[file_c].width;
+                                     p++)
                                 {
                                     cur_line->i32[p] = *channel_pixels++;
                                 }
@@ -568,8 +568,8 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                             {
                                 int32_t* channel_pixels = (int32_t*) (line_pixels);
                                 for (uint32_t p = 0;
-                                    p < encode->channels[file_c].width;
-                                    p++)
+                                     p < encode->channels[file_c].width;
+                                     p++)
                                 {
                                     cur_line->i32[p] = *channel_pixels++;
                                 }
@@ -580,7 +580,7 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                         }
 
                         line_pixels += encode->channels[line_c].bytes_per_element *
-                                    encode->channels[line_c].width;
+                            encode->channels[line_c].width;
                     }
                 }
             }
@@ -603,7 +603,7 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                         int16_t* channel_pixels =
                             (int16_t*) (line_pixels + cs_to_file_ch[c].raster_line_offset);
                         for (uint32_t p = 0; p < encode->channels[file_c].width;
-                            p++)
+                             p++)
                         {
                             cur_line->i32[p] = *channel_pixels++;
                         }
@@ -613,7 +613,7 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
                         int32_t* channel_pixels =
                             (int32_t*) (line_pixels + cs_to_file_ch[c].raster_line_offset);
                         for (uint32_t p = 0; p < encode->channels[file_c].width;
-                            p++)
+                             p++)
                         {
                             cur_line->i32[p] = *channel_pixels++;
                         }