Merge branch 'dfs_atk_support' of https://github.com/aous72/OpenJPH i…

…nto dfs_atk_support
aous72 · Apr 3, 2024 · 3322061 · 3322061
2 parents be39386 + 2c74db3
commit 3322061
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 44 deletions.
diff --git a/src/core/codestream/ojph_params_local.h b/src/core/codestream/ojph_params_local.h
@@ -856,8 +856,8 @@ namespace ojph {
       const param_atk* get_atk(int index) const;
       const lifting_step* get_step(ui32 s) const 
       { assert(s < Natk); return d + s; }
-      const ui32 get_num_steps() const { return Natk; }
-      const float get_K() const { return Katk; }
+      ui32 get_num_steps() const { return Natk; }
+      float get_K() const { return Katk; }
 
     private: // member variables
       ui16 Latk;         // structure length

diff --git a/src/core/codestream/ojph_resolution.cpp b/src/core/codestream/ojph_resolution.cpp
@@ -38,6 +38,7 @@
 
 #include <climits>
 #include <cmath>
+#include <new>
 
 #include "ojph_mem.h"
 #include "ojph_params.h"
@@ -54,48 +55,6 @@ namespace ojph {
 
   namespace local
   {
-
-    //////////////////////////////////////////////////////////////////////////
-    static void rotate_buffers(line_buf* line1, line_buf* line2,
-                               line_buf* line3, line_buf* line4)
-    {
-      assert(line1->size == line2->size &&
-             line1->pre_size == line2->pre_size &&
-             line1->size == line3->size &&
-             line1->pre_size == line3->pre_size &&
-             line1->size == line4->size &&
-             line1->pre_size == line4->pre_size);
-      si32* p = line4->i32;
-      line4->i32 = line3->i32;
-      line3->i32 = line2->i32;
-      line2->i32 = line1->i32;
-      line1->i32 = p;
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    static void rotate_buffers(line_buf* line1, line_buf* line2,
-                               line_buf* line3, line_buf* line4,
-                               line_buf* line5, line_buf* line6)
-    {
-      assert(line1->size == line2->size &&
-             line1->pre_size == line2->pre_size &&
-             line1->size == line3->size &&
-             line1->pre_size == line3->pre_size &&
-             line1->size == line4->size &&
-             line1->pre_size == line4->pre_size &&
-             line1->size == line5->size &&
-             line1->pre_size == line5->pre_size &&
-             line1->size == line6->size &&
-             line1->pre_size == line6->pre_size);
-      si32* p = line6->i32;
-      line6->i32 = line5->i32;
-      line5->i32 = line4->i32;
-      line4->i32 = line3->i32;
-      line3->i32 = line2->i32;
-      line2->i32 = line1->i32;
-      line1->i32 = p;
-    }
-
     //////////////////////////////////////////////////////////////////////////
     void resolution::pre_alloc(codestream* codestream, const rect& res_rect,
                                const rect& recon_res_rect,