refactor(SupportInputImageTypes): rapidjson to glaze

Author: thewtex

include/itkSupportInputImageTypes.h

@@ -31,21 +31,15 @@
 #include "itkSpecializedImagePipelineFunctor.h"
 #include "WebAssemblyInterfaceExport.h"
 
+#include "itkImageJSON.h"
+
 namespace itk
 {
 
-namespace wasm
-{
+WebAssemblyInterface_EXPORT bool lexical_cast(const std::string &input, ImageTypeJSON & imageType);
 
-struct InterfaceImageType
+namespace wasm
 {
-  unsigned int dimension{2};
-  std::string componentType{"uint8"};
-  std::string pixelType{"Scalar"};
-  unsigned int components{1};
-};
-
-WebAssemblyInterface_EXPORT bool lexical_cast(const std::string &input, InterfaceImageType & imageType);
 
 /** \class SupportInputImageTypes
  *
@@ -98,7 +92,7 @@ SupportInputImageTypes
   static int
   Dimensions(const std::string & inputImageOptionName, Pipeline & pipeline)
   {
-    InterfaceImageType imageType;
+    ImageTypeJSON imageType;
 
     const auto iwpArgc = pipeline.get_argc();
     const auto iwpArgv = pipeline.get_argv();
@@ -128,17 +122,20 @@ SupportInputImageTypes
 private:
   template<unsigned int VDimension, typename TPixel, typename ...TPixelsRest>
   static int
-  IteratePixelTypes(Pipeline & pipeline, const InterfaceImageType & imageType, bool passThrough = false)
+  IteratePixelTypes(Pipeline & pipeline, const ImageTypeJSON & imageType, bool passThrough = false)
   {
     constexpr unsigned int Dimension = VDimension;
     using PixelType = TPixel;
     using ConvertPixelTraits = DefaultConvertPixelTraits<PixelType>;
 
     if (passThrough ||
-        imageType.componentType == MapComponentType<typename ConvertPixelTraits::ComponentType>::ComponentString &&
-        imageType.pixelType == MapPixelType<PixelType>::PixelString)
+        imageType.componentType == MapComponentType<typename ConvertPixelTraits::ComponentType>::JSONComponentEnum &&
+        imageType.pixelType == MapPixelType<PixelType>::JSONPixelEnum)
     {
-      if (passThrough || imageType.pixelType == "VariableLengthVector" || imageType.pixelType == "VariableSizeMatrix" || imageType.components == ConvertPixelTraits::GetNumberOfComponents() )
+      if (passThrough ||
+         imageType.pixelType == JSONPixelTypesEnum::VariableLengthVector ||
+         imageType.pixelType == JSONPixelTypesEnum::VariableSizeMatrix ||
+         imageType.components == ConvertPixelTraits::GetNumberOfComponents() )
       {
         return SpecializedImagePipelineFunctor<TPipelineFunctor, Dimension, PixelType>()(pipeline);
       }
@@ -149,14 +146,15 @@ SupportInputImageTypes
     }
 
     std::ostringstream ostrm;
-    ostrm << "Unsupported pixel type: " << imageType.pixelType << " with component type: " << imageType.componentType << " and components: " << imageType.components;
+    std::string imageTypeString = glz::write_json(imageType).value_or("error");
+    ostrm << "Unsupported image type: " << imageTypeString << std::endl;
     CLI::Error err("Runtime error", ostrm.str(), 1);
     return pipeline.exit(err);
   }
 
   template<unsigned int VDimension, unsigned int ...VDimensions>
   static int
-  IterateDimensions(Pipeline & pipeline, const InterfaceImageType & imageType, bool passThrough = false)
+  IterateDimensions(Pipeline & pipeline, const ImageTypeJSON & imageType, bool passThrough = false)
   {
     if (passThrough || VDimension == imageType.dimension)
     {

src/itkOutputBinaryStream.cxx

@@ -21,7 +21,6 @@
 #ifndef ITK_WASM_NO_MEMORY_IO
 #include "itkWasmExports.h"
 #include <sstream>
-#include "rapidjson/document.h"
 #include "itkWasmStringStream.h"
 #endif
 

src/itkOutputTextStream.cxx

@@ -21,7 +21,6 @@
 #ifndef ITK_WASM_NO_MEMORY_IO
 #include "itkWasmExports.h"
 #include <sstream>
-#include "rapidjson/document.h"
 #include "itkWasmStringStream.h"
 #endif
 

src/itkSupportInputImageTypes.cxx

@@ -18,32 +18,28 @@
 #include "itkSupportInputImageTypes.h"
 #include "itkWasmExports.h"
 
-#include "rapidjson/document.h"
+#include "itkjsonFromIOComponentEnum.h"
+#include "itkjsonFromIOPixelEnum.h"
 
 namespace itk
 {
 
-namespace wasm
-{
-
-bool lexical_cast(const std::string &input, InterfaceImageType & imageType)
+bool lexical_cast(const std::string &input, ImageTypeJSON & imageType)
 {
   if (wasm::Pipeline::get_use_memory_io())
   {
 #ifndef ITK_WASM_NO_MEMORY_IO
     const unsigned int index = std::stoi(input);
-    auto json = getMemoryStoreInputJSON(0, index);
-    rapidjson::Document document;
-    if (document.Parse(json.c_str()).HasParseError())
-      {
-      throw std::runtime_error("Could not parse JSON");
-      }
-
-    const rapidjson::Value & jsonImageType = document["imageType"];
-    imageType.dimension = jsonImageType["dimension"].GetInt();
-    imageType.componentType = jsonImageType["componentType"].GetString();
-    imageType.pixelType = jsonImageType["pixelType"].GetString();
-    imageType.components = jsonImageType["components"].GetInt();
+    auto json = wasm::getMemoryStoreInputJSON(0, index);
+    std::string deserialized;
+    auto        deserializedAttempt = glz::read_json<itk::ImageJSON>(json);
+    if (!deserializedAttempt)
+    {
+      const std::string descriptiveError = glz::format_error(deserializedAttempt, json);
+      throw std::runtime_error("Failed to deserialize ImageJSON: " + descriptiveError);
+    }
+    auto imageJSON = deserializedAttempt.value();
+    imageType = imageJSON.imageType;
 #else
     return false;
 #endif
@@ -64,11 +60,11 @@ bool lexical_cast(const std::string &input, InterfaceImageType & imageType)
 
     using IOComponentType = itk::IOComponentEnum;
     const IOComponentType ioComponentEnum = imageIO->GetComponentType();
-    imageType.componentType = WasmComponentTypeFromIOComponentEnum( ioComponentEnum );
+    imageType.componentType = itk::jsonComponentTypeFromIOComponentEnum( ioComponentEnum );
 
     using IOPixelType = itk::IOPixelEnum;
     const IOPixelType ioPixelEnum = imageIO->GetPixelType();
-    imageType.pixelType = WasmPixelTypeFromIOPixelEnum( ioPixelEnum );
+    imageType.pixelType = itk::jsonFromIOPixelEnum( ioPixelEnum );
 
     imageType.components = imageIO->GetNumberOfComponents();
 #else
@@ -78,5 +74,4 @@ bool lexical_cast(const std::string &input, InterfaceImageType & imageType)
   return true;
 }
 
-} // end namespace wasm
 } // end namespace itk