Fixes warnings.

michaeldsmith · Jan 20, 2025 · a81e55f · a81e55f
1 parent 5551112
commit a81e55f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/core/codestream/ojph_codeblock.cpp b/src/core/codestream/ojph_codeblock.cpp
@@ -53,8 +53,8 @@ namespace ojph {
   {
 
     //////////////////////////////////////////////////////////////////////////
-    void codeblock::pre_alloc(codestream *codestream, ui32 comp_num,
-                              const size& nominal, ui32 precision)
+    void codeblock::pre_alloc(codestream *codestream, const size& nominal, 
+                              ui32 precision)
     {
       mem_fixed_allocator* allocator = codestream->get_allocator();
 

diff --git a/src/core/codestream/ojph_codeblock.h b/src/core/codestream/ojph_codeblock.h
@@ -71,8 +71,8 @@ namespace ojph {
       };
 
     public:
-      static void pre_alloc(codestream *codestream, ui32 comp_num, 
-                            const size& nominal, ui32 precision);
+      static void pre_alloc(codestream *codestream, const size& nominal, 
+                            ui32 precision);
       void finalize_alloc(codestream *codestream, subband* parent,
                           const size& nominal, const size& cb_size,
                           coded_cb_header* coded_cb,

diff --git a/src/core/codestream/ojph_params.cpp b/src/core/codestream/ojph_params.cpp
@@ -1385,7 +1385,7 @@ namespace ojph {
       int irrev = Sqcd & 0x1F;
 
       //marker size excluding header
-      Lqcd = 4 + (num_comps < 257 ? 0 : 1);
+      Lqcd = (ui16)(4 + (num_comps < 257 ? 0 : 1));
       if (irrev == 0)
         Lqcd = (ui16)(Lqcd + num_subbands);
       else if (irrev == 2)

diff --git a/src/core/codestream/ojph_subband.cpp b/src/core/codestream/ojph_subband.cpp
@@ -94,7 +94,7 @@ namespace ojph {
       ui32 precision = qp->propose_precision(cdp);
 
       for (ui32 i = 0; i < num_blocks.w; ++i)
-        codeblock::pre_alloc(codestream, comp_num, nominal, precision);
+        codeblock::pre_alloc(codestream, nominal, precision);
 
       //allocate lines
       allocator->pre_alloc_obj<line_buf>(1);