Depends on PR to dgtal

Remove NoObject from VoxelComplex DGtal-team/DGtal#1369
phcerdan · Jan 7, 2019 · 7883bcb · 7883bcb
1 parent bf4b7c2
commit 7883bcb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,9 @@ find_package(Boost COMPONENTS
         graph
         REQUIRED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-find_package(DGtal REQUIRED)
+# Requires version with this PR in: https://github.com/DGtal-team/DGtal/pull/1369
+# Merged in DGtal 1.0.beta
+find_package(DGtal REQUIRED 1.0)
 include_directories(SYSTEM ${DGTAL_INCLUDE_DIRS})
 find_package(ITK REQUIRED COMPONENTS
   ITKCommon

diff --git a/cpp-scripts/thin.cpp b/cpp-scripts/thin.cpp
@@ -23,8 +23,8 @@
 #include <DGtal/topology/CubicalComplexFunctions.h>
 #include "DGtal/topology/KhalimskyCellHashFunctions.h"
 
-#include <DGtal/topology/VoxelComplexNoObject.h>
-#include <DGtal/topology/VoxelComplexNoObjectFunctions.h>
+#include <DGtal/topology/VoxelComplex.h>
+#include <DGtal/topology/VoxelComplexFunctions.h>
 #include "DGtal/topology/NeighborhoodConfigurations.h"
 #include "DGtal/topology/tables/NeighborhoodTables.h"
 // ITKWriter
@@ -208,13 +208,13 @@ int main(int argc, char* const argv[]){
   Image image(handle_out);
 
 
-  // Create a VoxelComplexNoObject from the set
+  // Create a VoxelComplex from the set
   using DigitalTopology = DT26_6;
   using DigitalSet = // DGtal::Z3i::DigitalSet;
     DGtal::DigitalSetByAssociativeContainer<Domain ,
       std::unordered_set< typename Domain::Point> >;
   using ComplexMap = std::unordered_map<KSpace::Cell, DGtal::CubicalCellData>;
-  using Complex = DGtal::VoxelComplexNoObject<KSpace, ComplexMap>;
+  using Complex = DGtal::VoxelComplex<KSpace, ComplexMap>;
 
   auto & sk = sk_string;
   KSpace ks;