wavelet: move out of t1 namespace

Author: Grok Compression

src/lib/core/CMakeLists.txt

@@ -25,7 +25,7 @@ include_directories(
   ${GROK_SOURCE_DIR}/src/include
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/plugin
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1/wavelet
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavelet
   ${CMAKE_CURRENT_SOURCE_DIR}/t1
   ${CMAKE_CURRENT_SOURCE_DIR}/t1/part1
   ${CMAKE_CURRENT_SOURCE_DIR}/t1/part1/block_coder
@@ -134,10 +134,10 @@ set(GROK_LIBRARY_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/CodecScheduler.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/CoderPool.cpp
 
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1/wavelet/WaveletFwd.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1/wavelet/WaveletReverse.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1/wavelet/WaveletReverse97.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/t1/wavelet/WaveletReversePartial.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavelet/WaveletFwd.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavelet/WaveletReverse.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavelet/WaveletReverse97.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavelet/WaveletReversePartial.cpp
 
   ${CMAKE_CURRENT_SOURCE_DIR}/t1/CoderFactory.cpp
 

src/lib/core/codestream/decompress/CodeStreamDecompress_ReadMarkers.cpp

@@ -473,7 +473,7 @@ bool CodeStreamDecompress::readSIZ(uint8_t* headerData, uint16_t headerSize)
     headerImage_->has_multiple_tiles = numTilesToDecompress > 1;
   }
   auto maxDim = std::max(cp_.t_width_, cp_.t_height_);
-  t1::WaveletReverse::allocPoolData(maxDim);
+  WaveletReverse::allocPoolData(maxDim);
 
   return rc;
 }

src/lib/core/scheduling/whole_tile/DecompressScheduler.cpp

@@ -252,9 +252,9 @@ bool DecompressScheduler::schedule(TileProcessor* tileProcessor)
     {
       if(waveletReverse_[compno])
         delete waveletReverse_[compno];
-      waveletReverse_[compno] = new t1::WaveletReverse(tileProcessor, tilec, compno,
-                                                       tilec->getWindow()->unreducedBounds(),
-                                                       numRes, (tcp->tccps_ + compno)->qmfbid_);
+      waveletReverse_[compno] =
+          new WaveletReverse(tileProcessor, tilec, compno, tilec->getWindow()->unreducedBounds(),
+                             numRes, (tcp->tccps_ + compno)->qmfbid_);
 
       if(!waveletReverse_[compno]->decompress())
         return false;

src/lib/core/scheduling/whole_tile/DecompressScheduler.h

@@ -68,7 +68,7 @@ class DecompressScheduler : public WholeTileScheduler
   /**
    * @brief vector of @ref WaveletReverse pointers
    */
-  std::vector<t1::WaveletReverse*> waveletReverse_;
+  std::vector<WaveletReverse*> waveletReverse_;
 
   DifferentialInfo* differentialInfo_;
 

src/lib/core/tile_processor/TileProcessorCompress.cpp

@@ -291,7 +291,7 @@ bool TileProcessorCompress::doCompress(void)
       {
         auto tile_comp = tile_->comps_ + compno;
         auto tccp = tcp_->tccps_ + compno;
-        t1::WaveletFwdImpl w;
+        WaveletFwdImpl w;
         if(!w.compress(tile_comp, tccp->qmfbid_))
           return false;
       }

src/lib/core/util/GrkMatrix.h

@@ -15,7 +15,7 @@
  *
  */
 
- #pragma once
+#pragma once
 
 #include <cstdint>
 

src/lib/core/util/buffer.h

@@ -403,7 +403,7 @@ struct Buffer2d : protected Buffer<T, A>, public Rect32
   {
     if(!height() || !width())
       return true;
-    uint32_t newStride = stride ? stride : t1::alignedBufferWidth(width());
+    uint32_t newStride = stride ? stride : alignedBufferWidth(width());
     uint64_t eltsNeeded = (uint64_t)newStride * height();
     // avoid reallocation
     if(!eltsNeeded || eltsNeeded <= this->num_elts())

src/lib/core/t1/wavelet/WaveletCommon.h src/lib/core/wavelet/WaveletCommon.hsrc/lib/core/t1/wavelet/WaveletCommon.h renamed to src/lib/core/wavelet/WaveletCommon.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-namespace grk::t1
+namespace grk
 {
 
 template<typename T, size_t N>
@@ -68,4 +68,4 @@ uint32_t alignedBufferWidth(uint32_t width);
 
 typedef vec<float, 4> vec4f;
 
-} // namespace grk::t1
+} // namespace grk

src/lib/core/t1/wavelet/WaveletFwd.cpp src/lib/core/wavelet/WaveletFwd.cppsrc/lib/core/t1/wavelet/WaveletFwd.cpp renamed to src/lib/core/wavelet/WaveletFwd.cpp

@@ -23,7 +23,7 @@
 #include <hwy/foreach_target.h>
 #include <hwy/highway.h>
 HWY_BEFORE_NAMESPACE();
-namespace grk::t1
+namespace grk
 {
 
 template<typename T>
@@ -920,14 +920,14 @@ namespace HWY_NAMESPACE
   }
 
 } // namespace HWY_NAMESPACE
-} // namespace grk::t1
+} // namespace grk
 HWY_AFTER_NAMESPACE();
 
 #if HWY_ONCE
 
 #include "WaveletFwd.h"
 
-namespace grk::t1
+namespace grk
 {
 HWY_EXPORT(encode_53_v);
 HWY_EXPORT(encode_53_h);
@@ -1008,5 +1008,5 @@ void dwt97::encode_h(float* res, float* scratch, const uint32_t width, const uin
   HWY_DYNAMIC_DISPATCH(encode_97_h)(res, scratch, width, parity, stride, numrows);
 }
 
-} // namespace grk::t1
+} // namespace grk
 #endif

src/lib/core/t1/wavelet/WaveletFwd.h src/lib/core/wavelet/WaveletFwd.hsrc/lib/core/t1/wavelet/WaveletFwd.h renamed to src/lib/core/wavelet/WaveletFwd.h

@@ -20,7 +20,7 @@
 #include <cstdint>
 #include "TileComponent.h"
 
-namespace grk::t1
+namespace grk
 {
 class dwt53
 {
@@ -49,4 +49,4 @@ class WaveletFwdImpl
   bool compress(TileComponent* tile_comp, uint8_t qmfbid);
 };
 
-} // namespace grk::t1
+} // namespace grk