From 78d2ebf34204aa792acaf458ceebe9058829c7c1 Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Fri, 25 Jan 2013 20:41:21 +0100
Subject: [PATCH 1/2] small correction

---
 .../include/CGAL/Combinatorial_map_operations.h           | 2 +-
 .../include/CGAL/internal/Combinatorial_map_functors.h    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
index 2fcc17cb842..9b7ec63b201 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
@@ -275,7 +275,7 @@ namespace CGAL {
           {
             if ( i==1 || d1<d2 )
               tolink.push_back(Dart_pair(d1, d2));
-	        amap.update_dart_of_all_attributes(*it, mark);
+          amap.update_dart_of_all_attributes(*it, mark);
           }
           else
           {
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
index ad35dd18b99..03060059bfd 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
@@ -517,10 +517,12 @@ namespace CGAL {
                        std::deque<std::deque<typename Map::Dart_handle> >
                         *store )
       {
-        if ( i==j ) return;
-
         const int mark_for_jcells = mark_for_incident_cells
             [Map::Helper::template Dimension_index<j>::value];
+        amap->negate_mark( mark_for_jcells );
+
+        if ( i==j ) return;
+
         std::deque<std::deque<typename Map::Dart_handle> >& jcells =
             store[Map::Helper::template Dimension_index<j>::value];
 
@@ -533,8 +535,6 @@ namespace CGAL {
         typename Map::Helper::template Attribute_handle<j>::type
             a2=NULL;
 
-        amap->negate_mark( mark_for_jcells );
-
         for ( typename std::deque<std::deque<typename Map::Dart_handle> >::
               iterator it=jcells.begin(); it!=jcells.end(); ++it )
         {

From 5b36822e764a1c3012018fdd81dfccf06173639c Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Fri, 25 Jan 2013 21:48:39 +0100
Subject: [PATCH 2/2] Bug fix: can be improve later

---
 Combinatorial_map/include/CGAL/Combinatorial_map_operations.h | 4 +++-
 .../include/CGAL/internal/Combinatorial_map_functors.h        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
index 9b7ec63b201..e045941c888 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_operations.h
@@ -275,7 +275,6 @@ namespace CGAL {
           {
             if ( i==1 || d1<d2 )
               tolink.push_back(Dart_pair(d1, d2));
-          amap.update_dart_of_all_attributes(*it, mark);
           }
           else
           {
@@ -313,6 +312,9 @@ namespace CGAL {
                     &incident_cells[0]);
           }
         }
+
+        // TODO merge wth previous step
+        amap.update_dart_of_all_attributes(*it, mark);
       }
 
       // 2) We group the two (i+1)-cells if they exist.
diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
index 03060059bfd..5fd1b93c23a 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_functors.h
@@ -558,7 +558,7 @@ namespace CGAL {
               else
               {
                 a1=(*itj)->template attribute<j>();
-                a1->set_dart(*itj);
+                // TODO a1->set_dart(*itj);
               }
 
               for ( CMap_dart_iterator_basic_of_cell<Map,j>