Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 3dVolBoundaryViewer #395

Merged
merged 5 commits into from
Apr 9, 2021
Merged

Fix 3dVolBoundaryViewer #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
945204f
fix param when ITK
kerautret Apr 3, 2021
e7aeab5
changelog
kerautret Apr 3, 2021
37a4d01
typo
kerautret Apr 3, 2021
5918681
Merge branch 'master' into fix3dVolBoundaryViewer
kerautret Apr 6, 2021
b43081a
Merge branch 'master' into fix3dVolBoundaryViewer
kerautret Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 2 additions & 4 deletions visualisation/3dVolBoundaryViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down