Merge branch 'main2.0' into renamingCmakeVars

DGtal-team · Jan 26, 2025 · 485bf32 · 485bf32
2 parents 094d5d8 + 15c7c06
commit 485bf32
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/DGtal/base/Bits.cpp b/src/DGtal/base/Bits.cpp
@@ -30,9 +30,6 @@
 #include "DGtal/base/Bits.h"
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <iostream>
-
-
 ///////////////////////////////////////////////////////////////////////////////
 // class Bits
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/src/DGtal/base/Bits.h b/src/DGtal/base/Bits.h
@@ -29,9 +29,8 @@
 #define BITS_HPP
 
 #include <string>
+#include <algorithm>
 #include "DGtal/base/Common.h"
-#include "DGtal/base/BasicFunctors.h"
-#include "DGtal/base/ExpressionTemplates.h"
 
 namespace DGtal
 {
@@ -57,7 +56,6 @@ namespace DGtal
     static std::string bitString(T value, unsigned nbBits = 0)
     {
       std::string bitStr;
-      /*functors::Min<unsigned int> min;*/
 
       // if the requested number of bit is 0, use the size of the data type instead
       if(nbBits == 0) nbBits = sizeof(T)*8;

diff --git a/src/DGtal/base/Trace.ih b/src/DGtal/base/Trace.ih
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <stack>
 #include <cmath>
+#include "DGtal/base/Assert.h"      // for ASSERT
 //////////////////////////////////////////////////////////////////////////////
 
 
@@ -151,7 +152,7 @@ DGtal::Trace::endBlock()
   double tick;
   Clock *localClock;
 
-  ASSERT (myCurrentLevel >0);
+  ASSERT(myCurrentLevel >0);
 
   localClock =  myClockStack.top();
   tick = localClock->stopClock();

diff --git a/src/DGtal/images/Morton.ih b/src/DGtal/images/Morton.ih
@@ -29,7 +29,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 // Inclusions
-#include <iostream>
+#include "DGtal/base/ExpressionTemplates.h" // for POW
 //////////////////////////////////////////////////////////////////////////////
 
 namespace DGtal