From b435af6afd315ce640505005e0310a60e88194e5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 15 Feb 2012 13:03:09 +0000 Subject: [PATCH] Add svn:eol-style=native. Rewrite EOLs accordingly. --- .gitattributes | 2 - .../include/CGAL/AABB_segment_primitive.h | 134 ++++++++--------- .../include/CGAL/AABB_triangle_primitive.h | 136 +++++++++--------- 3 files changed, 135 insertions(+), 137 deletions(-) diff --git a/.gitattributes b/.gitattributes index 24829a0a07c..38dfe03cf13 100644 --- a/.gitattributes +++ b/.gitattributes @@ -38,9 +38,7 @@ AABB_tree/examples/AABB_tree/cleanup.bat -text AABB_tree/include/CGAL/AABB_intersections.h -text AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h -text AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h -text -AABB_tree/include/CGAL/AABB_segment_primitive.h -text AABB_tree/include/CGAL/AABB_traits.h -text -AABB_tree/include/CGAL/AABB_triangle_primitive.h -text AABB_tree/test/AABB_tree/AABB_test_util.h -text AABB_tree/test/AABB_tree/aabb_correctness_triangle_test.cpp -text AABB_tree/test/AABB_tree/aabb_distance_edge_test.cpp -text diff --git a/AABB_tree/include/CGAL/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h index 279a93b53ad..7e1a5edcd71 100644 --- a/AABB_tree/include/CGAL/AABB_segment_primitive.h +++ b/AABB_tree/include/CGAL/AABB_segment_primitive.h @@ -1,71 +1,71 @@ -// Copyright (c) 2009 INRIA Sophia-Antipolis (France). -// All rights reserved. -// +// 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. -// -// 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) : Pierre Alliez, Stephane Tayeb -// -//****************************************************************************** -// File Description : -// -//****************************************************************************** - -#ifndef CGAL_AABB_SEGMENT_PRIMITIVE_H_ -#define CGAL_AABB_SEGMENT_PRIMITIVE_H_ - -namespace CGAL { - -template -class AABB_segment_primitive -{ - // types -public: - typedef typename GeomTraits::Point_3 Point; // point type - typedef typename GeomTraits::Segment_3 Datum; // datum type - typedef Iterator Id; // Id type - - // member data -private: - Id m_it; - Datum m_datum; - -public: - // constructors - AABB_segment_primitive() {} - AABB_segment_primitive(Id it) - : m_it(it) - { - m_datum = *it; // copy segment - } - AABB_segment_primitive(const AABB_segment_primitive& primitive) - { - m_it = primitive.id(); - m_datum = primitive.datum(); - } -public: - Id& id() { return m_it; } - const Id& id() const { return m_it; } - Datum& datum() { return m_datum; } - const Datum& datum() const { return m_datum; } - - /// Returns a point on the primitive - Point reference_point() const { return m_datum.source(); } -}; - -} // end namespace CGAL - -#endif // CGAL_AABB_SEGMENT_PRIMITIVE_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) : Pierre Alliez, Stephane Tayeb +// +//****************************************************************************** +// File Description : +// +//****************************************************************************** + +#ifndef CGAL_AABB_SEGMENT_PRIMITIVE_H_ +#define CGAL_AABB_SEGMENT_PRIMITIVE_H_ + +namespace CGAL { + +template +class AABB_segment_primitive +{ + // types +public: + typedef typename GeomTraits::Point_3 Point; // point type + typedef typename GeomTraits::Segment_3 Datum; // datum type + typedef Iterator Id; // Id type + + // member data +private: + Id m_it; + Datum m_datum; + +public: + // constructors + AABB_segment_primitive() {} + AABB_segment_primitive(Id it) + : m_it(it) + { + m_datum = *it; // copy segment + } + AABB_segment_primitive(const AABB_segment_primitive& primitive) + { + m_it = primitive.id(); + m_datum = primitive.datum(); + } +public: + Id& id() { return m_it; } + const Id& id() const { return m_it; } + Datum& datum() { return m_datum; } + const Datum& datum() const { return m_datum; } + + /// Returns a point on the primitive + Point reference_point() const { return m_datum.source(); } +}; + +} // end namespace CGAL + +#endif // CGAL_AABB_SEGMENT_PRIMITIVE_H_ + diff --git a/AABB_tree/include/CGAL/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h index 0a5be985c10..6238297d24b 100644 --- a/AABB_tree/include/CGAL/AABB_triangle_primitive.h +++ b/AABB_tree/include/CGAL/AABB_triangle_primitive.h @@ -1,72 +1,72 @@ -// Copyright (c) 2009 INRIA Sophia-Antipolis (France). -// All rights reserved. -// +// 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. -// -// 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) : Pierre Alliez, Stephane Tayeb -// -//****************************************************************************** -// File Description : -// -//****************************************************************************** - -#ifndef CGAL_AABB_TRIANGLE_PRIMITIVE_H_ -#define CGAL_AABB_TRIANGLE_PRIMITIVE_H_ - -namespace CGAL { - - template - class AABB_triangle_primitive - { - public: - // types - typedef Iterator Id; // Id type - typedef typename GeomTraits::Point_3 Point; // point type - typedef typename GeomTraits::Triangle_3 Datum; // datum type - - private: - // member data - Id m_it; // iterator - Datum m_datum; // 3D triangle - - // constructor - public: - AABB_triangle_primitive() {} - AABB_triangle_primitive(Id it) - : m_it(it) - { - m_datum = *it; // copy triangle - } - AABB_triangle_primitive(const AABB_triangle_primitive& primitive) - { - m_datum = primitive.datum(); - m_it = primitive.id(); - } - public: - Id& id() { return m_it; } - const Id& id() const { return m_it; } - Datum& datum() { return m_datum; } - const Datum& datum() const { return m_datum; } - - /// Returns a point on the primitive - Point reference_point() const { return m_datum.vertex(0); } - }; - -} // end namespace CGAL - - -#endif // CGAL_AABB_TRIANGLE_PRIMITIVE_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) : Pierre Alliez, Stephane Tayeb +// +//****************************************************************************** +// File Description : +// +//****************************************************************************** + +#ifndef CGAL_AABB_TRIANGLE_PRIMITIVE_H_ +#define CGAL_AABB_TRIANGLE_PRIMITIVE_H_ + +namespace CGAL { + + template + class AABB_triangle_primitive + { + public: + // types + typedef Iterator Id; // Id type + typedef typename GeomTraits::Point_3 Point; // point type + typedef typename GeomTraits::Triangle_3 Datum; // datum type + + private: + // member data + Id m_it; // iterator + Datum m_datum; // 3D triangle + + // constructor + public: + AABB_triangle_primitive() {} + AABB_triangle_primitive(Id it) + : m_it(it) + { + m_datum = *it; // copy triangle + } + AABB_triangle_primitive(const AABB_triangle_primitive& primitive) + { + m_datum = primitive.datum(); + m_it = primitive.id(); + } + public: + Id& id() { return m_it; } + const Id& id() const { return m_it; } + Datum& datum() { return m_datum; } + const Datum& datum() const { return m_datum; } + + /// Returns a point on the primitive + Point reference_point() const { return m_datum.vertex(0); } + }; + +} // end namespace CGAL + + +#endif // CGAL_AABB_TRIANGLE_PRIMITIVE_H_ +