Fix mixed eol styles

This commit is contained in:
Laurent Rineau 2012-08-02 13:35:03 +00:00
parent c342d02fd2
commit 4c3e1c3138
24 changed files with 213 additions and 228 deletions

View File

@ -111,24 +111,24 @@ public:
#endif
#endif
/*! \class
* Inner class Data derived from Rep class
*/
class Data : public Rep
{
friend class Td_active_edge<Td_traits_>;
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<Td_traits_>;
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;

View File

@ -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<Td_traits_>;
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<Td_traits_>;
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;

View File

@ -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<Td_traits_>;
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<Td_traits_>;
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;

View File

@ -73,10 +73,10 @@ public:
//type of Td_dag_node (Self)
typedef Td_dag_node<Traits> 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

View File

@ -111,22 +111,22 @@ public:
#endif
#endif
/*! \class
* Inner class Data derived from Rep class
*/
class Data : public Rep
{
friend class Td_inactive_edge<Td_traits_>;
public:
//c'tors
Data (boost::shared_ptr<X_monotone_curve_2>& _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<Td_traits_>;
public:
//c'tors
Data (boost::shared_ptr<X_monotone_curve_2>& _cv, Dag_node* _p_node)
: cv(_cv), p_node(_p_node) //, lb(_lb),lt(_lt),rb(_rb),rt(_rt)
{ }
~Data() { }
protected:
boost::shared_ptr<X_monotone_curve_2> cv;
Dag_node* p_node;
};

View File

@ -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<Td_traits_>;
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<Td_traits_>;
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;

View File

@ -110,21 +110,21 @@ public:
#endif
#endif
/*! \class
* Inner class Data derived from Rep class
*/
class Data : public Rep
{
friend class Td_inactive_vertex<Td_traits_>;
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<Td_traits_>;
public:
//c'tors
Data (Point _p, Dag_node* _p_node): p(_p),p_node(_p_node)
{ }
~Data() { }
protected:
Point p;
Dag_node* p_node;
};

View File

@ -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 <fernando.cacciola@geometryfactory.com>
#ifndef CGAL_QT_BEZIER_CURVES_H
#define CGAL_QT_BEZIER_CURVES_H
#include <CGAL/value_type_traits.h>
//
// 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 <fernando.cacciola@geometryfactory.com>
#ifndef CGAL_QT_BEZIER_CURVES_H
#define CGAL_QT_BEZIER_CURVES_H
#include <CGAL/value_type_traits.h>
#include <CGAL/Qt/PiecewiseSetGraphicsItem.h>
#include <CGAL/Qt/BoundaryPiecesGraphicsItem.h>
#include <CGAL/Qt/Converter.h>
@ -31,11 +31,11 @@
namespace CGAL {
namespace Qt {
struct Bezier_helper
{
template<class OPoint, class IPoint> static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; }
{
template<class OPoint, class IPoint> static OPoint cvtp2 ( IPoint const& p ) { return OPoint( to_double(p.x()), to_double(p.y()) ) ; }
template<class Bezier_point>
static Point_2< Simple_cartesian<double> > 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<double> >(x,y);
}
template<class Bezier_point, class Bezier_curve>
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<class Ctrl_points, class FT>
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<class Control_point_in_iterator, class NT, class Control_point_out_iterator>
static void recursive_subdivision( Control_point_in_iterator aBeginCtrlPts
, Control_point_in_iterator aEndCtrlPts
@ -217,7 +217,7 @@ struct Bezier_X_monotone_bbox
template<class Bezier_X_monotone_curve>
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<Rat_point_2> lQ ;
Bezier_helper::clip(aBXMC,lQ);
return CGAL::bbox_2(lQ.begin(), lQ.end());
@ -229,9 +229,9 @@ struct Draw_bezier_curve
template<class Bezier_curve, class Path>
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_2> Rat_point_vector ;
typedef Simple_cartesian<double> Linear_kernel ;
@ -291,19 +291,19 @@ struct Draw_bezier_X_monotone_curve
template<class Bezier_X_monotone_curve, class Path>
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_2> Rat_point_vector ;
typedef Simple_cartesian<double> Linear_kernel ;
typedef Qt::Converter<Linear_kernel> Converter ;
typedef Point_2<Linear_kernel> Linear_point ;
typedef std::vector<Linear_point> Linear_point_vector ;
typedef std::vector<Linear_point> Linear_point_vector ;
Rat_point_vector lQ ;

View File

@ -39,7 +39,7 @@ class GpsCircleSegmentGraphicsItem : public GraphicsItem
{
typedef CS Circle_segment_2 ;
typedef Qt::Converter< Simple_cartesian<double> > Converter ;
typedef Qt::Converter< Simple_cartesian<double> > Converter ;
public:
@ -121,7 +121,7 @@ GpsCircleSegmentGraphicsItem<CS>::paint(QPainter *painter,
QWidget * widget)
{
painter->setPen(edgesPen());
if ( !cs_.is_full() )
{
double sx = to_double(cs_.source().x());
@ -135,7 +135,7 @@ GpsCircleSegmentGraphicsItem<CS>::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<CS>::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<CS>::updateBoundingBox()
prepareGeometryChange();
if(cs_.is_circular())
{
{
bounding_rect = convert(cs_.supporting_circle().bbox());
}
else
@ -202,15 +202,15 @@ GpsCircleSegmentGraphicsItem<CS>::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) ;
}
}

View File

@ -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.

View File

@ -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.

View File

@ -227,4 +227,4 @@ if ( UNIT_TEST_VERSION_UTILS )
endif()
endif()
endif()

View File

@ -205,4 +205,4 @@ package Mail::Sender;
1;
# list of extensions by "Guillaume A." <webmaster@patchworks-et-boutons.com>
# list of extensions by "Guillaume A." <webmaster@patchworks-et-boutons.com>

View File

@ -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>());

View File

@ -53,10 +53,3 @@ if ARGV.length > 0
else
RDoc::usage
end

View File

@ -117,5 +117,3 @@ unless src_package_root.empty? || tgt_build_root.empty? then
else
RDoc::usage
end

View File

@ -101,5 +101,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then
else
RDoc::usage
end

View File

@ -97,5 +97,3 @@ unless src_package_dir.empty? || tgt_build_dir.empty? then
else
RDoc::usage
end

View File

@ -68,5 +68,3 @@ unless src_package_subdir.empty? || tgt_build_root.empty? then
else
RDoc::usage
end

View File

@ -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/)

View File

@ -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.
- \ccc{Non_manifold_tag}: the output mesh has no guarantee and hence is outputted as a polygon soup.

View File

@ -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.
See \ccc{poisson_reconstruction_example.cpp} example above.

View File

@ -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);

View File

@ -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(); }