feat(Compress): Add ParseStringDecompress

Author: thewtex

src/CMakeLists.txt

@@ -29,6 +29,7 @@ if(BUILD_ITK_WASM_IO_MODULES)
 set(common_link_flags " -s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM=1 -s MODULARIZE=1 -s WASM=1 -lnodefs.js -s EXIT_RUNTIME=0 -s INVOKE_RUN=1 --post-js ${CMAKE_CURRENT_SOURCE_DIR}/emscripten-module/itkJSPost.js")
 set(esm_link_flags " -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0")
 
+add_subdirectory(io/internal/pipelines/common/CompressStringify)
 add_subdirectory(io/internal/pipelines/image/ConvertImage)
 add_subdirectory(io/internal/pipelines/image/ReadDICOM)
 

src/io/internal/pipelines/common/CompressStringify/Base64.h

@@ -16,27 +16,41 @@ option(ZSTD_BUILD_LZ4 "BUILD_LZ4" OFF)
 option(ZSTD_BUILD_LZMA "BUILD_LZMA" OFF)
 option(ZSTD_BUILD_ZLIB "BUILD_ZLIB" OFF)
 set(zstd_GIT_REPOSITORY "https://github.com/facebook/zstd.git")
-# v1.5.0
-set(zstd_GIT_TAG fe616643e0f17552025f50b84508ac5b286dd30f)
+# v1.5.2
+set(zstd_GIT_TAG c9c7be85f49f45a581ec00c309afda5c62ba9ef2)
 FetchContent_Declare(
   zstd_lib
   GIT_REPOSITORY ${zstd_GIT_REPOSITORY}
   GIT_TAG        ${zstd_GIT_TAG}
 )
-set(zstd_lib_INCLUDE_DIR "${zstd_lib_SOURCE_DIR}/lib")
 
-FetchContent_MakeAvailable(zstd_lib)
+set(cpp_base64_GIT_REPOSITORY "https://github.com/thewtex/cpp-base64.git")
+set(cpp_base64_GET_TAG 9144cd53be930b37235ae552a92b5d2aa51e9325)
+FetchContent_Declare(
+  cpp_base64
+  GIT_REPOSITORY ${cpp_base64_GIT_REPOSITORY}
+  GIT_TAG        ${cpp_base64_GIT_TAG}
+)
+
+FetchContent_MakeAvailable(zstd_lib cpp_base64)
+set(zstd_lib_INCLUDE_DIR "${zstd_lib_SOURCE_DIR}/lib")
+include_directories(${zstd_lib_INCLUDE_DIR})
+# message(FATAL_ERROR "${zstd_lib_INCLUDE_DIR}")
 add_subdirectory("${zstd_lib_SOURCE_DIR}/build/cmake" "${zstd_lib_BINARY_DIR}")
 
 find_package(ITK REQUIRED COMPONENTS WebAssemblyInterface)
 include(${ITK_USE_FILE})
 
 add_executable(CompressStringify CompressStringify.cxx)
 target_include_directories(CompressStringify PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${zstd_lib_INCLUDE_DIR})
-target_link_libraries(CompressStringify PUBLIC zstd ${ITK_LIBRARIES})
+target_link_libraries(CompressStringify PUBLIC libzstd_static cpp-base64 ${ITK_LIBRARIES})
+
+add_executable(ParseStringDecompress ParseStringDecompress.cxx)
+target_include_directories(ParseStringDecompress PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${zstd_lib_INCLUDE_DIR})
+target_link_libraries(ParseStringDecompress PUBLIC libzstd_static cpp-base64 ${ITK_LIBRARIES})
 
 if (DEFINED WebAssemblyInterface_SOURCE_DIR)
-  foreach(target CompressStringify CompressStringify.umd)
+  foreach(target CompressStringify CompressStringify.umd ParseStringDecompress ParseStringDecompress.umd)
     itk_module_target_label(${target})
     itk_module_target_export(${target})
     itk_module_target_install(${target})

src/io/internal/pipelines/common/CompressStringify/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*=========================================================================
- *
+
  *  Copyright NumFOCUS
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
 #include <iterator>
 
 #include "zstd.h"
-#include "Base64.h"
+#include "cpp-base64/base64.h"
 
 #include "itkPipeline.h"
 #include "itkInputBinaryStream.h"
@@ -68,23 +68,25 @@ int compressStringify(itk::wasm::Pipeline & pipeline, itk::wasm::InputBinaryStre
 
 
   const size_t compressedBufferSize = ZSTD_compressBound(inputBinary.size());
-  std::vector<char> compressedBinary(compressedBufferSize);
+  std::string compressedBinary;
+  compressedBinary.resize(compressedBufferSize);
 
   const size_t compressedSize = ZSTD_compress(compressedBinary.data(), compressedBufferSize, inputBinary.data(), inputBinary.size(), compressionLevel);
   compressedBinary.resize(compressedSize);
 
-  std::ostringstream outputText;
-  tgk::utils::b64::b64_encode(compressedBinary, outputText, compressedSize);
+  // Do we want/need this?
+  constexpr bool urlFriendly = false;
+  auto outputText = base64_encode(compressedBinary, urlFriendly);
 
   outputTextStream.Get() << dataURLPrefix;
-  outputTextStream.Get() << outputText.str();
+  outputTextStream.Get() << outputText;
 
   return EXIT_SUCCESS;
 }
 
 int main(int argc, char * argv[])
 {
-  itk::wasm::Pipeline pipeline("Given a binary, compress with stringify and optionally base64 encode", argc, argv);
+  itk::wasm::Pipeline pipeline("Given a binary, compress optionally base64 encode", argc, argv);
 
   itk::wasm::InputBinaryStream inputBinaryStream;
   pipeline.add_option("InputBinary", inputBinaryStream, "Input binary");