Merge pull request #395 from kerautret/fix3dVolBoundaryViewer

Fix 3dVolBoundaryViewer
DGtal-team · Apr 9, 2021 · 42d46af · 42d46af
2 parents dda16f1 + b43081a
commit 42d46af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,16 +1,15 @@
 # DGtalTools 1.2
 - *global*
-  - Fix itk2vol and fix ITK cmake configuaration that was making wrong the ITK image read.
-  (Bertrand Kerautret [#393](https://github.com/DGtal-team/DGtalTools/pull/393))
-<<<<<<< HEAD
-
+  - Travis: Fix old default osx_image with xcode12.2 and remove non used boost
+    cmake references. (Bertrand Kerautret [#394](https://github.com/DGtal-team/DGtalTools/pull/394)) 
 
+- *visualisation*
+  - 3dVolBoundaryViewer: fix compilation issue (related to CLI11 change) when ITK is activated.
+   (Bertrand Kerautret [#395](https://github.com/DGtal-team/DGtalTools/pull/395))
 
+- Fix itk2vol and fix ITK cmake configuaration that was making wrong the ITK image read.
+  (Bertrand Kerautret [#393](https://github.com/DGtal-team/DGtalTools/pull/393))
 
-=======
-  - Travis: Fix old default osx_image with xcode12.2 and remove non used boost
-    cmake references. (Bertrand Kerautret [#394](https://github.com/DGtal-team/DGtalTools/pull/394)) 
->>>>>>> bf6f26204de31698d991a81f19627f225426d146
 
 # DGtalTools 1.1
 

diff --git a/visualisation/3dVolBoundaryViewer.cpp b/visualisation/3dVolBoundaryViewer.cpp
@@ -160,14 +160,12 @@ int main( int argc, char** argv )
      ){
     trace.beginBlock( "Loading image into memory." );
 #ifdef WITH_ITK
-    int dicomMin = vm["dicomMin"].as<int>();
-    int dicomMax = vm["dicomMax"].as<int>();
     typedef DGtal::functors::Rescaling<int ,unsigned char > RescalFCT;
-    Image image = extension == "dcm" ? DicomReader< Image,  RescalFCT  >::importDicom( inputFilename,
+    Image image = extension == "dcm" ? DicomReader< Image,  RescalFCT  >::importDicom( inputFileName,
                                                                                       RescalFCT(dicomMin,
                                                                                                 dicomMax,
                                                                                                 0, 255) ) :
-    GenericReader<Image>::import( inputFilename );
+    GenericReader<Image>::import( inputFileName );
 #else
     Image image = GenericReader<Image>::import (inputFileName );
 #endif