From b38a1bdcf054cabe4658d86b11c0ba9cb1547548 Mon Sep 17 00:00:00 2001
From: David Cazier <david.cazier@unistra.fr>
Date: Mon, 3 Dec 2012 18:14:55 +0100
Subject: [PATCH] closeMap(bool) => pour vraiment fermer une carte

---
 include/Algo/Import/importSvg.hpp | 2 +-
 include/Topology/map/map2.h       | 2 +-
 src/Topology/map/map2.cpp         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/Algo/Import/importSvg.hpp b/include/Algo/Import/importSvg.hpp
index ae0e5eee..9552ed03 100644
--- a/include/Algo/Import/importSvg.hpp
+++ b/include/Algo/Import/importSvg.hpp
@@ -490,7 +490,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
 	}
 
 	//close the intersections
-	map.closeMap() ;
+	map.closeMap(false) ;
 
 	//embed the path
 	for (Dart d = map.begin() ; d != map.end() ; map.next(d))
diff --git a/include/Topology/map/map2.h b/include/Topology/map/map2.h
index 0406e040..d6d9dbcf 100644
--- a/include/Topology/map/map2.h
+++ b/include/Topology/map/map2.h
@@ -475,7 +475,7 @@ public:
 	 *  These faces are marked as boundary.
 	 *  @return the number of closed holes
 	 */
-	unsigned int closeMap();
+	unsigned int closeMap(bool forboundary = true);
 	//@}
 };
 
diff --git a/src/Topology/map/map2.cpp b/src/Topology/map/map2.cpp
index 844662be..4f69d596 100644
--- a/src/Topology/map/map2.cpp
+++ b/src/Topology/map/map2.cpp
@@ -906,7 +906,7 @@ unsigned int Map2::closeHole(Dart d, bool forboundary)
 	return countEdges ;
 }
 
-unsigned int Map2::closeMap()
+unsigned int Map2::closeMap(bool forboundary)
 {
 	// Search the map for topological holes (fix points of phi2)
 	unsigned int nb = 0 ;
@@ -915,7 +915,7 @@ unsigned int Map2::closeMap()
 		if (phi2(d) == d)
 		{
 			++nb ;
-			closeHole(d);
+			closeHole(d, forboundary);
 		}
 	}
 	return nb ;
-- 
GitLab