- major switch from .C to .cpp. Andreas's script left a lot of things that

had to be fixed manually.
- new debug macro in <CGAL/Surface_mesher/Standard_criteria.h>
  - CGAL_MESH_3_DEBUG_CRITERIA
  Used in test/Mesh_3/combined_spheres*.cpp

Mesh_3/applications/README

@@ -52,7 +52,7 @@ lanteri:
           'display_facets_by_surface_indices_statistics',
 	  'display_vertices_by_surface_indices_statistics',
 	  'display_cells_by_volume_indices_statistics'.
-  - distribution.h and distribution.C declare and define functions
+  - distribution.h and distribution.cpp declare and define functions
           'compute_distribution',
           'display_distribution'.
     They use Distribution_displayer.h.
@@ -61,18 +61,18 @@ lanteri:
           'fill_rectangle',
 	  'segment'
   - Gd_displayer.h Qt_widget_displayer.h
-    Gd_displayer.C Qt_widget_displayer.C
+    Gd_displayer.cpp Qt_widget_displayer.cpp
       implementes two different classes derived of
       'Distribution_displayer' (two implementation for displaying).
-  - lanteri_process_results.C defines three functions (declared in
-  lanteri.C):
+  - lanteri_process_results.cpp defines three functions (declared in
+  lanteri.cpp):
           'process_cells',
 	  'process_volume_edges',
 	  'process_surface_edges'.
   - lanteri_utils.h defines two templated functions:
           'scan_edges_and_process',
 	  'scan_cells_and_process'.
-    These two functions use functions of lanteri_process_results.C.
+    These two functions use functions of lanteri_process_results.cpp.
 
 lanteri_output_tet_mesh:
 -----------------------
@@ -180,8 +180,12 @@ Usage:
 
 Uses utils.h and weighted_types.h.
 
-test_off
+test_off:
 --------
-test if an OFF file described a manifold surface or not
-from the combinatorial point of view :
-more precisely it tests if any edge is incident to two faces
+This tool tests if an OFF file describes a manifold surface or not from the
+combinatorial point of view : more precisely it tests if any edge is
+incident to two faces.
+
+Usage:
+./test_off [OFF_FILE_NAME.off]
+    will analyse OFF_FILE_NAME.off and display the list of non manifold edges.

Mesh_3/applications/makefile

@@ -47,7 +47,7 @@ all:            \
                 slivers_exuder$(EXE_EXT) \
                 cgal_to_medit$(EXE_EXT) \
                 stat_mesh$(EXE_EXT) \
-		test_off.C 
+		test_off$(EXE_EXT) 
 
 cgal_to_medit$(EXE_EXT): cgal_to_medit$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)cgal_to_medit cgal_to_medit$(OBJ_EXT) $(LDFLAGS)
@@ -112,5 +112,5 @@ clean: \
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

Mesh_3/applications/makefile.dependencies

@@ -3,10 +3,10 @@ deps:
 
 .PHONY: renew_deps
 
-.%.deps: %.C
+.%.deps: %.cpp
 	$(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@
 
-DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C))))
+DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.cpp))))
 
 renew_deps: $(DEPS_FILES)
 

Mesh_3/changes.txt

@@ -1,3 +1,14 @@
+10 July 2006 Laurent Rineau
+- new debug macros:
+  - CGAL_MESH_3_DIRTY_DEBUG_SPHERES,
+  - and CGAL_MESHES_DEBUG_REFINEMENT_POINTS.
+- new macro CGAL_MESHES_OUTPUT_STREAM, which is set to std::cout by
+default.
+- in Mesh_2: new header <CGAL/Mesh_2/Output_stream.h>
+- new debug macro in <CGAL/Surface_mesher/Standard_criteria.h>
+  - CGAL_MESH_3_DEBUG_CRITERIA
+  Used in test/Mesh_3/combined_spheres*.cpp 
+
 7 July 2006 Laurent Rineau
 - in test/Mesh_3/combined_spheres*.C:
   - new surface criterion class, named Uniform_size_multi_surface_criterion

Mesh_3/examples/Mesh_3/makefile

@@ -19,7 +19,7 @@ all: $(DEFAULT_TARGETS)
 #                    ImageIO files
 #---------------------------------------------------------------------#
 
-IMAGEIO_PATH = ../../../Surface_mesher/examples/Surface_mesher/ImageIO/
+IMAGEIO_PATH = ../../../Surface_mesher/examples/Surface_mesher/ImageIO
 
 include $(IMAGEIO_PATH)/imageio.mk
 
@@ -31,6 +31,7 @@ include $(IMAGEIO_PATH)/imageio.mk
 
 CXXFLAGS = -I../../../Data_structure_for_queries_3/include \
            -I ../../../Surface_mesher/include \
+           -I ../../../Mesh_2/include \
 	   -I../../include \
            -I$(IMAGEIO_PATH) \
 	   $(OTHER_INCLUDES) \

Mesh_3/examples/Mesh_3/makefile.dependencies

@@ -3,10 +3,10 @@ deps:
 
 .PHONY: renew_deps
 
-.%.deps: %.C
+.%.deps: %.cpp
 	$(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@
 
-DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C))))
+DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.cpp))))
 
 renew_deps: $(DEPS_FILES)
 

Mesh_3/test/Mesh_3/GNUmakefile

@@ -88,7 +88,7 @@ clean: \
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
 #---------------------------------------------------------------------#

Mesh_3/test/Mesh_3/makefile.dependencies

@@ -3,10 +3,10 @@ deps:
 
 .PHONY: renew_deps
 
-.%.deps: %.C
+.%.deps: %.cpp
 	$(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@
 
-DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C))))
+DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.cpp))))
 
 renew_deps: $(DEPS_FILES)
 

Surface_mesher/changes.txt

@@ -5,6 +5,9 @@ include/CGAL/Surface_mesher/Point_surface_indices_oracle_visitor.h
 too) in <CGAL/Surface_mesher/Surface_mesher.h>
 - major switch from .C to .cpp. Andreas's script left a lot of things that
 had to be fixed manually.
+- new debug macro in <CGAL/Surface_mesher/Standard_criteria.h>
+  - CGAL_MESH_3_DEBUG_CRITERIA
+  Used in test/Mesh_3/combined_spheres*.cpp 
 
 6 July 2006 Laurent Rineau
 - fix typos in make_surface_mesh.tex.

Surface_mesher/include/CGAL/Surface_mesher/Standard_criteria.h

@@ -59,6 +59,19 @@ namespace CGAL {
 	     criteria.end(); ++cit)
 	if ((*cit)->is_bad (f, q[i++]))
           bad = true;
+#ifdef CGAL_SURFACE_MESHER_DEBUG_CRITERIA
+      if( bad )
+      {
+        std::cerr << "bad triangle: |";
+        for(typename Criteria::iterator cit = criteria.begin(); cit !=
+              criteria.end(); ++cit)
+        {
+          FT dummy_q;
+          std::cerr << (*cit)->is_bad (f, dummy_q) << "|" ;
+        }
+        std::cerr << "\n";
+      }
+#endif
       return bad;
     }
   };
@@ -224,7 +237,7 @@ namespace CGAL {
       typedef typename Geom_traits::FT FT;
       Geom_traits gt;
 
-      Point p1 = fh.first->vertex ((fh.second+1)&3)->point();
+      const Point& p1 = fh.first->vertex ((fh.second+1)&3)->point();
 
       q =  B / gt.compute_squared_distance_3_object()
 	(p1, fh.first->get_facet_surface_center (fh.second));
@@ -232,8 +245,6 @@ namespace CGAL {
     }
   };  // end Uniform_size_criterion
 
-
-
   // Edge size Criterion class
   template <class Tr>
   class Edge_size_criterion : public Refine_criterion <Tr> {