cosmetic changes

2020-08-18 10:06:51 +02:00 · 2020-08-18 10:06:51 +02:00 · e893ac1178
parent b29a31ae27
commit e893ac1178
21 changed files with 12 additions and 38 deletions
--- a/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
+++ b/BGL/include/CGAL/boost/graph/alpha_expansion_graphcut.h
@ -1,4 +1,3 @@
-#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_H
 // Copyright (c) 2014  GeometryFactory (France).  All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -10,6 +9,7 @@
 //
 // Author(s)     : Ilker O. Yaz, Simon Giraudot

+#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_H
 #define CGAL_BOOST_GRAPH_ALPHA_EXPANSION_GRAPHCUT_H

 #include <CGAL/Iterator_range.h>
--- a/STL_Extension/include/CGAL/Cache.h
+++ b/STL_Extension/include/CGAL/Cache.h
@ -1,5 +1,3 @@
-// =============================================================================
-//
 // Copyright (c) 2001-2007 Max-Planck-Institute Saarbruecken (Germany).
 // All rights reserved.
 //
@ -11,7 +9,6 @@
 //
 // Author(s)     : Michael Hemmer    <hemmer@mpi-inf.mpg.de>
 //
-// =============================================================================

 #ifndef CGAL_CACHE_H
 #define CGAL_CACHE_H 1
--- a/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/internal/Auto_count.h
+++ b/Scale_space_reconstruction_3/include/CGAL/Scale_space_reconstruction_3/internal/Auto_count.h
@ -1,4 +1,3 @@
-//A unary operator to that counts instances.
 //Copyright (C) 2013  INRIA - Sophia Antipolis
 //
 // This file is part of CGAL (www.cgal.org).
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/internal/Euler_extensions.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/internal/Euler_extensions.h
@ -1,5 +1,3 @@
-// ======================================================================
-//
 // Copyright (c) 2005-2017 GeometryFactory (France).  All Rights Reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -11,7 +9,6 @@
 //
 // Author(s): Le-Jeng Shiue <Andy.Shiue@gmail.com>
 //
-// ======================================================================

 #ifndef CGAL_SUBDIVISION_METHOD_3_INTERNAL_EULER_EXTENSIONS_H
 #define CGAL_SUBDIVISION_METHOD_3_INTERNAL_EULER_EXTENSIONS_H
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/internal/subdivision_hosts_impl_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/internal/subdivision_hosts_impl_3.h
@ -1,5 +1,3 @@
-// ======================================================================
-//
 // Copyright (c) 2005-2017 GeometryFactory (France).  All Rights Reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -11,7 +9,6 @@
 //
 // Author(s): Le-Jeng Shiue <Andy.Shiue@gmail.com>
 //
-// ======================================================================

 #ifndef CGAL_SUBDIVISION_HOSTS_IMPL_3_H
 #define CGAL_SUBDIVISION_HOSTS_IMPL_3_H
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
@ -1,5 +1,3 @@
-// ======================================================================
-//
 // Copyright (c) 2017 GeometryFactory (France).  All Rights Reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -11,7 +9,6 @@
 //
 // Author(s): Le-Jeng Shiue <Andy.Shiue@gmail.com>
 //
-// ======================================================================

 #ifndef CGAL_SUBDIVISION_HOSTS_3_H
 #define CGAL_SUBDIVISION_HOSTS_3_H
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_masks_3.h
@ -1,5 +1,3 @@
-// ======================================================================
-//
 // Copyright (c) 2005-2017 GeometryFactory (France).  All Rights Reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -11,7 +9,6 @@
 //
 // Author(s): Le-Jeng Shiue <Andy.Shiue@gmail.com>
 //
-// ======================================================================

 #ifndef CGAL_SUBDIVISION_MASKS_3_H
 #define CGAL_SUBDIVISION_MASKS_3_H
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
@ -1,5 +1,3 @@
-// ======================================================================
-//
 // Copyright (c) 2005-2017 GeometryFactory (France).  All Rights Reserved.
 //
 // This file is part of CGAL (www.cgal.org)
@ -11,7 +9,6 @@
 //
 // Author(s): Le-Jeng Shiue <Andy.Shiue@gmail.com>
 //
-// ======================================================================

 #ifndef CGAL_SUBDIVISION_METHODS_3_H
 #define CGAL_SUBDIVISION_METHODS_3_H
--- a/Subdivision_method_3/include/CGAL/subdivision_method_3.h
+++ b/Subdivision_method_3/include/CGAL/subdivision_method_3.h
@ -1,4 +1,3 @@
-// ======================================================================
 //
 // Copyright (c) 2017 GeometryFactory (France).  All Rights Reserved.
 //
@ -11,7 +10,6 @@
 //
 // Author(s):
 //
-// ======================================================================

 /**
 * \ingroup PkgSurfaceSubdivisionMethod3Ref
--- a/Surface_mesh/include/CGAL/Surface_mesh/IO.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/IO.h
@ -1,4 +1,3 @@
-//=============================================================================
 // Copyright (C) 2001-2005 by Computer Graphics Group, RWTH Aachen
 // Copyright (C) 2011 by Graphics & Geometry Group, Bielefeld University
 // Copyright (C) 2014 GeometryFactory
--- a/Surface_mesh/include/CGAL/Surface_mesh/Properties.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/Properties.h
@ -1,4 +1,3 @@
-//=============================================================================
 // Copyright (C) 2001-2005 by Computer Graphics Group, RWTH Aachen
 // Copyright (C) 2011 by Graphics & Geometry Group, Bielefeld University
 // Copyright (C) 2014 GeometryFactory
--- a/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h
+++ b/Surface_mesh_segmentation/include/CGAL/boost/graph/Alpha_expansion_MaxFlow_tag.h
@ -1,4 +1,3 @@
-#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_MAXFLOW_IMPL_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -10,6 +9,7 @@
 //
 // Author(s)     : Ilker O. Yaz, Simon Giraudot

+#ifndef CGAL_BOOST_GRAPH_ALPHA_EXPANSION_MAXFLOW_IMPL_H
 #define CGAL_BOOST_GRAPH_ALPHA_EXPANSION_MAXFLOW_IMPL_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traits.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traits.h
@ -1,4 +1,3 @@
-#ifndef CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAITS_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAITS_H
 #define CGAL_INTERNAL_SURFACE_MESH_SEGMENTATION_AABB_TRAITS_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Disk_samplers.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_DISK_SAMPLERS_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_EXPECTATION_MAXIMIZATION_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_EXPECTATION_MAXIMIZATION_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_EXPECTATION_MAXIMIZATION_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Filters.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Filters.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_FILTERS_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -10,7 +9,7 @@
 //
 // Author(s)     : Ilker O. Yaz

-
+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_FILTERS_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_FILTERS_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/K_means_clustering.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_K_MEANS_CLUSTERING_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_K_MEANS_CLUSTERING_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_K_MEANS_CLUSTERING_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/SDF_calculation.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/SDF_calculation.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_SDF_CALCULATION_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_SDF_CALCULATION_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_SDF_CALCULATION_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Surface_mesh_segmentation.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Surface_mesh_segmentation.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -11,6 +10,7 @@
 // Author(s)     : Ilker O. Yaz


+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
+++ b/Surface_mesh_segmentation/include/CGAL/mesh_segmentation.h
@ -1,4 +1,3 @@
-#ifndef CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H
 // Copyright (c) 2014  GeometryFactory Sarl (France).
 // All rights reserved.
 //
@ -10,7 +9,7 @@
 //
 // Author(s)     : Ilker O. Yaz

-
+#ifndef CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H
 #define CGAL_SURFACE_MESH_SEGMENTATION_MESH_SEGMENTATION_H

 #include <CGAL/license/Surface_mesh_segmentation.h>
--- a/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h
+++ b/Surface_mesher/include/CGAL/IO/facets_in_complex_2_to_triangle_mesh.h
@ -1,7 +1,5 @@
 // Copyright (c) 2007-09  INRIA Sophia-Antipolis (France).
 // Copyright (c) 2017 GeometryFactory (France).
-
-
 // All rights reserved.
 //
 // This file is part of CGAL (www.cgal.org).
@ -11,6 +9,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial
 //
 // Author(s) : Maxime Gimeno, Pierre Alliez
+
 #ifndef CGAL_FACETS_IN_COMPLEX_2_TO_TRIANGLE_MESH_H
 #define CGAL_FACETS_IN_COMPLEX_2_TO_TRIANGLE_MESH_H

@ -65,7 +64,7 @@ void facets_in_complex_2_to_triangle_mesh(const C2T3& c2t3, TriangleMesh& graph)

    CGAL_assertion_code(typename Tr::size_type nb_facets = 0; )

-        while (oriented_set.size() != number_of_facets) {
+    while (oriented_set.size() != number_of_facets) {
      while ( fit->first->is_facet_on_surface(fit->second) == false ||
              oriented_set.find(*fit) != oriented_set.end() ||