Merge pull request #447 from kerautret/volReSampleExpFix

Vol re sample exp fix
DGtal-team · Feb 11, 2023 · 288cdca · 288cdca
2 parents 354fa2d + 753dc79
commit 288cdca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,11 +1,17 @@
 # DGtalTools 1.4 (beta)
 
+
+- *volumetric*
+    - volReSample: fix the impossibility to export to vol when ITK is activated
+      (Bertrand Kerautret [#445](https://github.com/DGtal-team/DGtalTools/pull/445))
+
 - *converters*
    - mesh2vol: small fix to read generic mesh. 
      (Bertrand Kerautret [#444](https://github.com/DGtal-team/DGtal/pull/444))
 
 
 
+
 # DGtalTools 1.3
 
 - *build*

diff --git a/volumetric/volReSample.cpp b/volumetric/volReSample.cpp
@@ -135,13 +135,22 @@ int main( int argc, char** argv )
   const functors::Identity aFunctor{};
   SamplerImageAdapter sampledImage ( input3dImage, reSampler.getSubSampledDomain(), reSampler, aFunctor );
 #ifdef WITH_ITK
-  ITKWriter<SamplerImageAdapter>::exportITK(outputFileName, sampledImage,
-                                            Z3i::RealPoint(aGridSizeReSample[0],
-                                                           aGridSizeReSample[1],
-                                                           aGridSizeReSample[2]));
+    const std::string ext = outputFileName.substr( outputFileName.find_last_of(".") + 1 );
+    if (std::find(ITK_IO_IMAGE_EXT.begin(),
+                  ITK_IO_IMAGE_EXT.end(), ext) != ITK_IO_IMAGE_EXT.end() )
+    {
+        ITKWriter<SamplerImageAdapter>::exportITK(outputFileName, sampledImage,
+                                                  Z3i::RealPoint(aGridSizeReSample[0],
+                                                                 aGridSizeReSample[1],
+                                                                 aGridSizeReSample[2]));
+    }
+    else
+    {
+        GenericWriter<SamplerImageAdapter>::exportFile(outputFileName, sampledImage);
+    }
+
 #else
   GenericWriter<SamplerImageAdapter>::exportFile(outputFileName, sampledImage);
-
 #endif
 
   return 0;