diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h index 7a5de53d058..9be7c08042e 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_edge.h @@ -111,24 +111,24 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_active_edge; - - public: - //c'tors - Data (Halfedge_const_handle _he, - const Td_map_item& _next, - Dag_node* _p_node) - : he(_he),next(_next),p_node(_p_node) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_active_edge; + + public: + //c'tors + Data (Halfedge_const_handle _he, + const Td_map_item& _next, + Dag_node* _p_node) + : he(_he),next(_next),p_node(_p_node) + { } + + ~Data() { } + + protected: Halfedge_const_handle he; Td_map_item next; Dag_node* p_node; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h index eaaad1da7ca..9c357522fd7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_fictitious_vertex.h @@ -115,24 +115,24 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_active_fictitious_vertex; - - public: - //c'tors - Data (Vertex_const_handle _v, - Halfedge_const_handle _cw_he, - Dag_node* _p_node) - : v(_v),cw_he(_cw_he),p_node(_p_node) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_active_fictitious_vertex; + + public: + //c'tors + Data (Vertex_const_handle _v, + Halfedge_const_handle _cw_he, + Dag_node* _p_node) + : v(_v),cw_he(_cw_he),p_node(_p_node) + { } + + ~Data() { } + + protected: Vertex_const_handle v; Halfedge_const_handle cw_he; //holds the first edge going cw starting at 12 o'clock Dag_node* p_node; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h index 1b3ac6bf7f7..9070c072f79 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_active_vertex.h @@ -115,24 +115,24 @@ class Td_active_vertex : public Handle #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_active_vertex; - - public: - //c'tors - Data (Vertex_const_handle _v, - Halfedge_const_handle _cw_he, - Dag_node* _p_node) - : v(_v),cw_he(_cw_he),p_node(_p_node) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_active_vertex; + + public: + //c'tors + Data (Vertex_const_handle _v, + Halfedge_const_handle _cw_he, + Dag_node* _p_node) + : v(_v),cw_he(_cw_he),p_node(_p_node) + { } + + ~Data() { } + + protected: Vertex_const_handle v; Halfedge_const_handle cw_he; //holds the first edge going cw starting at 12 o'clock Dag_node* p_node; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h index 7e0237cb3a8..81fc56b79b7 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_dag_node.h @@ -73,10 +73,10 @@ public: //type of Td_dag_node (Self) typedef Td_dag_node Self; - //type of td_map_item - typedef typename Traits::Td_map_item Td_map_item; - - //type of Td_active_trapezoid + //type of td_map_item + typedef typename Traits::Td_map_item Td_map_item; + + //type of Td_active_trapezoid typedef typename Traits::Td_active_trapezoid Td_active_trapezoid; #ifndef CGAL_CFG_USING_BASE_MEMBER_BUG_2 @@ -100,19 +100,19 @@ protected: public: - class clear_neighbors_visitor : public boost::static_visitor< void > - { - public: - void operator()(Td_active_trapezoid& t) const - { - t.clear_neighbors(); - } - - template < typename Tp > - void operator()(Tp& t) const - { - } - + class clear_neighbors_visitor : public boost::static_visitor< void > + { + public: + void operator()(Td_active_trapezoid& t) const + { + t.clear_neighbors(); + } + + template < typename Tp > + void operator()(Tp& t) const + { + } + }; //c'tors diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h index 2f143a82f7d..c122c97f2b2 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_edge.h @@ -111,22 +111,22 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_inactive_edge; - - public: - //c'tors - Data (boost::shared_ptr& _cv, Dag_node* _p_node) - : cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_inactive_edge; + + public: + //c'tors + Data (boost::shared_ptr& _cv, Dag_node* _p_node) + : cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt) + { } + + ~Data() { } + + protected: boost::shared_ptr cv; Dag_node* p_node; }; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h index fd72a5795e7..82b890e5972 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_fictitious_vertex.h @@ -114,23 +114,23 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_inactive_fictitious_vertex; - - public: - //c'tors - Data (const X_monotone_curve_2& _cv, - Arr_curve_end _ce, - Dag_node* _p_node): cv(_cv),ce(_ce),p_node(_p_node) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_inactive_fictitious_vertex; + + public: + //c'tors + Data (const X_monotone_curve_2& _cv, + Arr_curve_end _ce, + Dag_node* _p_node): cv(_cv),ce(_ce),p_node(_p_node) + { } + + ~Data() { } + + protected: X_monotone_curve_2 cv; Arr_curve_end ce; Dag_node* p_node; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h index 99195e649d8..14162e6f361 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_inactive_vertex.h @@ -110,21 +110,21 @@ public: #endif #endif - /*! \class - * Inner class Data derived from Rep class - */ - class Data : public Rep - { - friend class Td_inactive_vertex; - - public: - //c'tors - Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node) - { } - - ~Data() { } - - protected: + /*! \class + * Inner class Data derived from Rep class + */ + class Data : public Rep + { + friend class Td_inactive_vertex; + + public: + //c'tors + Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node) + { } + + ~Data() { } + + protected: Point p; Dag_node* p_node; }; diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h index 626d80a8b48..5f1880fb015 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/BezierCurves.h @@ -1,27 +1,27 @@ -// Copyright (c) 2009 GeometryFactory Sarl (France). -// All rights reserved. -// +// Copyright (c) 2009 GeometryFactory Sarl (France). +// All rights reserved. +// // This file is part of CGAL (www.cgal.org). // You can redistribute it and/or modify it under the terms of the GNU // General Public License as published by the Free Software Foundation, // either version 3 of the License, or (at your option) any later version. -// -// Licensees holding a valid commercial license may use this file in -// accordance with the commercial license agreement provided with the software. -// -// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// -// $URL$ -// $Id$ -// -// -// Author(s) : Fernando Cacciola - -#ifndef CGAL_QT_BEZIER_CURVES_H -#define CGAL_QT_BEZIER_CURVES_H - -#include +// +// Licensees holding a valid commercial license may use this file in +// accordance with the commercial license agreement provided with the software. +// +// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +// +// $URL$ +// $Id$ +// +// +// Author(s) : Fernando Cacciola + +#ifndef CGAL_QT_BEZIER_CURVES_H +#define CGAL_QT_BEZIER_CURVES_H + +#include #include #include #include @@ -31,11 +31,11 @@ namespace CGAL { namespace Qt { - + struct Bezier_helper -{ - template static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; } - +{ + template static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; } + template static Point_2< Simple_cartesian > refine_bezier_point ( Bezier_point const& aP, double aError = 1e-2 ) { @@ -43,48 +43,48 @@ struct Bezier_helper typedef typename Bounding_traits::NT NT ; NT min_x, min_y, max_x, max_y ; - - NT const error(aError); - - bool lCanRefine = true ; + + NT const error(aError); + + bool lCanRefine = true ; do { aP.get_bbox (min_x, min_y, max_x, max_y); - lCanRefine = !aP.is_exact() && ( CGAL_NTS abs( max_x - min_x) > error || CGAL_NTS abs( max_y - min_y ) > error ) ; - if ( lCanRefine ) + lCanRefine = !aP.is_exact() && ( CGAL_NTS abs( max_x - min_x) > error || CGAL_NTS abs( max_y - min_y ) > error ) ; + if ( lCanRefine ) lCanRefine = aP.refine(); } - while ( lCanRefine ) ; - - NT const two(2.0); + while ( lCanRefine ) ; + + NT const two(2.0); double x = to_double( ( min_x + max_x ) / two ) ; double y = to_double( ( min_y + max_y ) / two ) ; return Point_2< Simple_cartesian >(x,y); } - + template static typename Bezier_point::Bez_point_bound::NT get_endpoint_parameter( Bezier_point const& aP, Bezier_curve const& aCurve, unsigned int aXID ) { typedef typename Bezier_point::Originator_iterator Originator_iterator ; Originator_iterator lOrg = aP.get_originator(aCurve, aXID); - - typedef typename Bezier_point::Bez_point_bound::NT NT ; - - refine_bezier_point(aP); - - return ( lOrg->point_bound().t_min + lOrg->point_bound().t_max ) / NT(2.0); + + typedef typename Bezier_point::Bez_point_bound::NT NT ; + + refine_bezier_point(aP); + + return ( lOrg->point_bound().t_min + lOrg->point_bound().t_max ) / NT(2.0); } - + template static void clip_impl ( Ctrl_points& rQ, FT aS, FT aT) { - FT const zero(0.0); - FT const one (1.0); + FT const zero(0.0); + FT const one (1.0); if ( aS >= zero || aT <= one ) { @@ -109,9 +109,9 @@ struct Bezier_helper static void clip ( Bezier_X_monotone_curve const& aXMCurve, Ctrl_points& rQ ) { - typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ; + typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ; typedef typename Bezier_X_monotone_curve::Bounding_traits::NT BoundNT ; - typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; + typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; Bezier_curve const& lBC = aXMCurve.supporting_curve(); @@ -122,15 +122,15 @@ struct Bezier_helper BoundNT lMin = lFwd ? lS : BoundNT(1.0) - lS ; BoundNT lMax = lFwd ? lT : BoundNT(1.0) - lT ; - - std::copy( lBC.control_points_begin(), lBC.control_points_end(), std::back_inserter(rQ) ) ; - if ( !lFwd ) - std::reverse(rQ.begin(), rQ.end()); + + std::copy( lBC.control_points_begin(), lBC.control_points_end(), std::back_inserter(rQ) ) ; + if ( !lFwd ) + std::reverse(rQ.begin(), rQ.end()); - clip_impl(rQ, lMin, lMax ); + clip_impl(rQ, lMin, lMax ); } - + template static void recursive_subdivision( Control_point_in_iterator aBeginCtrlPts , Control_point_in_iterator aEndCtrlPts @@ -217,7 +217,7 @@ struct Bezier_X_monotone_bbox template Bbox_2 operator()( Bezier_X_monotone_curve const& aBXMC ) const { - typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; + typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; std::vector lQ ; Bezier_helper::clip(aBXMC,lQ); return CGAL::bbox_2(lQ.begin(), lQ.end()); @@ -229,9 +229,9 @@ struct Draw_bezier_curve template void operator()( Bezier_curve const& aBC, Path& aPath, int aIdx ) const { - typedef typename Bezier_curve::Bounding_traits::NT BoundNT ; - typedef typename Bezier_curve::Rat_kernel::Point_2 Rat_point_2 ; - + typedef typename Bezier_curve::Bounding_traits::NT BoundNT ; + typedef typename Bezier_curve::Rat_kernel::Point_2 Rat_point_2 ; + typedef std::vector Rat_point_vector ; typedef Simple_cartesian Linear_kernel ; @@ -291,19 +291,19 @@ struct Draw_bezier_X_monotone_curve template void operator()( Bezier_X_monotone_curve const& aBXMC, Path& aPath, int aIdx ) const { - typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ; + typedef typename Bezier_X_monotone_curve::Curve_2 Bezier_curve ; typedef typename Bezier_X_monotone_curve::Bounding_traits::NT BoundNT ; - typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; - + typedef typename Bezier_X_monotone_curve::Rat_kernel::Point_2 Rat_point_2 ; + typedef std::vector Rat_point_vector ; - + typedef Simple_cartesian Linear_kernel ; typedef Qt::Converter Converter ; typedef Point_2 Linear_point ; - typedef std::vector Linear_point_vector ; + typedef std::vector Linear_point_vector ; Rat_point_vector lQ ; diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h index bfe9fa6ff7a..ebc47ff6175 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/include/CGAL/Qt/GpsCircleSegmentGraphicsItem.h @@ -39,7 +39,7 @@ class GpsCircleSegmentGraphicsItem : public GraphicsItem { typedef CS Circle_segment_2 ; - typedef Qt::Converter< Simple_cartesian > Converter ; + typedef Qt::Converter< Simple_cartesian > Converter ; public: @@ -121,7 +121,7 @@ GpsCircleSegmentGraphicsItem::paint(QPainter *painter, QWidget * widget) { painter->setPen(edgesPen()); - + if ( !cs_.is_full() ) { double sx = to_double(cs_.source().x()); @@ -135,7 +135,7 @@ GpsCircleSegmentGraphicsItem::paint(QPainter *painter, } else { - double cx = to_double(cs_.supporting_circle().center().x()); + double cx = to_double(cs_.supporting_circle().center().x()); double cy = to_double(cs_.supporting_circle().center().y()); double x0, y0, x1, y1 ; @@ -172,12 +172,12 @@ GpsCircleSegmentGraphicsItem::paint(QPainter *painter, { if( cs_.orientation() != COLLINEAR) { - double cx = to_double(cs_.supporting_circle().center().x()); + double cx = to_double(cs_.supporting_circle().center().x()); double cy = to_double(cs_.supporting_circle().center().y()); double rad = std::sqrt(CGAL::to_double(cs_.supporting_circle().squared_radius())); painter->drawArc(cx -rad, cy - rad, 2 * rad, 2 * rad, 0, 360*16); } - } + } @@ -192,7 +192,7 @@ GpsCircleSegmentGraphicsItem::updateBoundingBox() prepareGeometryChange(); if(cs_.is_circular()) - { + { bounding_rect = convert(cs_.supporting_circle().bbox()); } else @@ -202,15 +202,15 @@ GpsCircleSegmentGraphicsItem::updateBoundingBox() double x_max = to_double(cs_.target().x()); double y_max = to_double(cs_.target().y()); - if(x_min > x_max) + if(x_min > x_max) { std::swap(x_min, x_max); std::swap(y_min, y_max); - } - + } + if(y_min > y_max) std::swap(y_min, y_max); - + bounding_rect = QRectF(x_min,y_min,x_max,y_max) ; } } diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h index 8bbbf42497a..20e5be30299 100644 --- a/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h +++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/typedefs.h @@ -1,10 +1,10 @@ // Copyright (c) 2009 GeometryFactory Sarl (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org). -// You can redistribute it and/or modify it under the terms of the GNU -// General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Circular_kernel_3/include/CGAL/Circle_type.h b/Circular_kernel_3/include/CGAL/Circle_type.h index ca8e755e4e5..483680fa216 100644 --- a/Circular_kernel_3/include/CGAL/Circle_type.h +++ b/Circular_kernel_3/include/CGAL/Circle_type.h @@ -1,10 +1,10 @@ // Copyright (c) 2009 INRIA Sophia-Antipolis (France). // All rights reserved. // -// This file is part of CGAL (www.cgal.org). -// You can redistribute it and/or modify it under the terms of the GNU -// General Public License as published by the Free Software Foundation, -// either version 3 of the License, or (at your option) any later version. +// This file is part of CGAL (www.cgal.org). +// You can redistribute it and/or modify it under the terms of the GNU +// General Public License as published by the Free Software Foundation, +// either version 3 of the License, or (at your option) any later version. // // Licensees holding a valid commercial license may use this file in // accordance with the commercial license agreement provided with the software. diff --git a/Installation/cmake/modules/CGAL_VersionUtils.cmake b/Installation/cmake/modules/CGAL_VersionUtils.cmake index 37627dd169a..11a88cbb428 100644 --- a/Installation/cmake/modules/CGAL_VersionUtils.cmake +++ b/Installation/cmake/modules/CGAL_VersionUtils.cmake @@ -227,4 +227,4 @@ if ( UNIT_TEST_VERSION_UTILS ) endif() -endif() \ No newline at end of file +endif() diff --git a/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm b/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm index f190f664339..e4fe064eebc 100755 --- a/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm +++ b/Maintenance/svn_server/hooks/Mail/Sender/CType/Ext.pm @@ -205,4 +205,4 @@ package Mail::Sender; 1; -# list of extensions by "Guillaume A." \ No newline at end of file +# list of extensions by "Guillaume A." diff --git a/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp b/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp index afc400119a2..0867a9f85e6 100644 --- a/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp +++ b/Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_spheres_3.cpp @@ -31,7 +31,7 @@ int main(void) Line line; Plane plane; - Kernel kernel; + Kernel kernel; Point centroid; linear_least_squares_fitting_3(spheres.begin(),spheres.end(),line,CGAL::Dimension_tag<3>()); diff --git a/Scripts/developer_scripts/list_package_files.rb b/Scripts/developer_scripts/list_package_files.rb index 349a3dcc602..4cb763bd86f 100644 --- a/Scripts/developer_scripts/list_package_files.rb +++ b/Scripts/developer_scripts/list_package_files.rb @@ -53,10 +53,3 @@ if ARGV.length > 0 else RDoc::usage end - - - - - - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_all_packages.rb b/Scripts/developer_scripts/mirror_all_packages.rb index ed72293ac98..a3e4af719a1 100644 --- a/Scripts/developer_scripts/mirror_all_packages.rb +++ b/Scripts/developer_scripts/mirror_all_packages.rb @@ -117,5 +117,3 @@ unless src_package_root.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_package.rb b/Scripts/developer_scripts/mirror_package.rb index 2c75972d6b6..dcbce30f95d 100644 --- a/Scripts/developer_scripts/mirror_package.rb +++ b/Scripts/developer_scripts/mirror_package.rb @@ -101,5 +101,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/mirror_package_files.rb b/Scripts/developer_scripts/mirror_package_files.rb index 338990cba0e..89fe65ef3c3 100644 --- a/Scripts/developer_scripts/mirror_package_files.rb +++ b/Scripts/developer_scripts/mirror_package_files.rb @@ -97,5 +97,3 @@ unless src_package_dir.empty? || tgt_build_dir.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Scripts/developer_scripts/remove_package_files_from_build_tree.rb b/Scripts/developer_scripts/remove_package_files_from_build_tree.rb index 794be51b10e..14276cf9ab9 100644 --- a/Scripts/developer_scripts/remove_package_files_from_build_tree.rb +++ b/Scripts/developer_scripts/remove_package_files_from_build_tree.rb @@ -68,5 +68,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then else RDoc::usage end - - \ No newline at end of file diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index aba2919721d..02f17da8a01 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -4,13 +4,13 @@ project( Surface_mesh_parameterization_example ) cmake_minimum_required(VERSION 2.6.2) -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) - if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) - cmake_policy(VERSION 2.8.4) - else() - cmake_policy(VERSION 2.6) - endif() -endif() +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6) + if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3) + cmake_policy(VERSION 2.8.4) + else() + cmake_policy(VERSION 2.6) + endif() +endif() # Require packages new or improved since CGAL 3.4 include_directories (BEFORE ../../../Installation/include/) diff --git a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex index 6a5e4bd2c56..7fde5920642 100644 --- a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex +++ b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/contouring.tex @@ -6,4 +6,4 @@ The computed implicit functions can be iso-contoured to reconstruct a surface by The parameter \ccc{Tag} affects the behavior of \ccc{make_surface_mesh()}: \\ - \ccc{Manifold_tag}: the output mesh is guaranteed to be a manifold surface without boundary.\\ - \ccc{Manifold_with_boundary_tag}: the output mesh is guaranteed to be manifold and may have boundaries.\\ -- \ccc{Non_manifold_tag}: the output mesh has no guarantee and hence is outputted as a polygon soup. \ No newline at end of file +- \ccc{Non_manifold_tag}: the output mesh has no guarantee and hence is outputted as a polygon soup. diff --git a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex index 9b4d08b8bc4..6fb926a1021 100644 --- a/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex +++ b/Surface_reconstruction_points_3/doc_tex/Surface_reconstruction_points_3/output.tex @@ -8,4 +8,4 @@ Other \cgal\ components provide functions to write the reconstructed surface mes \ccc{CGAL::output_surface_facets_to_off} \\ \ccc{CGAL::output_surface_facets_to_polyhedron} \\ -See \ccc{poisson_reconstruction_example.cpp} example above. \ No newline at end of file +See \ccc{poisson_reconstruction_example.cpp} example above. diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.cpp b/Triangulation_3/demo/Triangulation_3/Viewer.cpp index 108ad36a192..9ad81eb4df7 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.cpp +++ b/Triangulation_3/demo/Triangulation_3/Viewer.cpp @@ -30,7 +30,7 @@ void Viewer::init() // Set Smooth Shading ::glShadeModel(GL_SMOOTH); - // depth buffer setup + // depth buffer setup ::glClearDepth(1.0f); ::glEnable(GL_DEPTH_TEST); ::glDepthFunc(GL_LEQUAL); diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.h b/Triangulation_3/demo/Triangulation_3/Viewer.h index 0885602c7fd..1d6e86c3a63 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.h +++ b/Triangulation_3/demo/Triangulation_3/Viewer.h @@ -151,9 +151,9 @@ public slots : // show options inline void toggleShowAxis(bool flag) { m_showAxis = flag; updateGL(); } - inline void toggleShowVertex(bool flag) { m_showVertex = flag; updateGL(); } - inline void toggleShowDEdge(bool flag) { m_showDEdge = flag; updateGL(); } - inline void toggleShowVEdge(bool flag) { m_showVEdge = flag; updateGL(); } + inline void toggleShowVertex(bool flag) { m_showVertex = flag; updateGL(); } + inline void toggleShowDEdge(bool flag) { m_showDEdge = flag; updateGL(); } + inline void toggleShowVEdge(bool flag) { m_showVEdge = flag; updateGL(); } inline void toggleShowFacet(bool flag) { m_showFacet = flag; updateGL(); } inline void toggleFlat(bool flag) { m_isFlat = flag; updateGL(); }