From 513be5d88c9ed585ea004494727b2bebfa70e2cc Mon Sep 17 00:00:00 2001 From: vmora Date: Fri, 5 Jul 2013 18:18:11 +0200 Subject: [PATCH] - fixed include all.h in offset example - astyle in the rest should be the very last commit before tag 1.0 --- example/SFCGAL-offset/main.cpp | 2 +- .../detail/transform/AffineTransform2.cpp | 12 ++-- .../detail/transform/AffineTransform3.cpp | 70 +++++++++++-------- 3 files changed, 47 insertions(+), 37 deletions(-) diff --git a/example/SFCGAL-offset/main.cpp b/example/SFCGAL-offset/main.cpp index 53db5200..65de52c6 100644 --- a/example/SFCGAL-offset/main.cpp +++ b/example/SFCGAL-offset/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/SFCGAL/detail/transform/AffineTransform2.cpp b/src/SFCGAL/detail/transform/AffineTransform2.cpp index a196734b..b95c154c 100644 --- a/src/SFCGAL/detail/transform/AffineTransform2.cpp +++ b/src/SFCGAL/detail/transform/AffineTransform2.cpp @@ -29,17 +29,19 @@ namespace transform { /// /// AffineTransform2::AffineTransform2( CGAL::Aff_transformation_2< Kernel > transform ): - _transform( transform ) { + _transform( transform ) +{ } /* * [SFCGAL::Transform] */ -void AffineTransform2::transform( Point& p ) { - if ( ! p.isEmpty() ){ - p = Point( p.toPoint_2().transform( _transform ) ); - } +void AffineTransform2::transform( Point& p ) +{ + if ( ! p.isEmpty() ) { + p = Point( p.toPoint_2().transform( _transform ) ); + } } diff --git a/src/SFCGAL/detail/transform/AffineTransform3.cpp b/src/SFCGAL/detail/transform/AffineTransform3.cpp index 1147e2a9..5d491110 100644 --- a/src/SFCGAL/detail/transform/AffineTransform3.cpp +++ b/src/SFCGAL/detail/transform/AffineTransform3.cpp @@ -43,80 +43,88 @@ namespace transform { /// /// AffineTransform3::AffineTransform3( CGAL::Aff_transformation_3< Kernel > transform ): - _transform( transform ) { + _transform( transform ) +{ } /// /// /// -void AffineTransform3::transform( Point& p ) { - if ( ! p.isEmpty() ) { - p = Point( p.toPoint_3().transform( _transform ) ) ; - } +void AffineTransform3::transform( Point& p ) +{ + if ( ! p.isEmpty() ) { + p = Point( p.toPoint_3().transform( _transform ) ) ; + } } /// /// /// -void AffineTransform3::transform( LineString& ls ) { - for ( size_t i = 0; i < ls.numPoints(); ++i ) { - transform( ls.pointN( i ) ); - } +void AffineTransform3::transform( LineString& ls ) +{ + for ( size_t i = 0; i < ls.numPoints(); ++i ) { + transform( ls.pointN( i ) ); + } } /// /// /// -void AffineTransform3::transform( Triangle& tri ) { - transform( tri.vertex( 0 ) ); - transform( tri.vertex( 1 ) ); - transform( tri.vertex( 2 ) ); +void AffineTransform3::transform( Triangle& tri ) +{ + transform( tri.vertex( 0 ) ); + transform( tri.vertex( 1 ) ); + transform( tri.vertex( 2 ) ); } /// /// /// -void AffineTransform3::transform( Polygon& poly ) { - transform( poly.exteriorRing() ); +void AffineTransform3::transform( Polygon& poly ) +{ + transform( poly.exteriorRing() ); - for ( size_t i = 0; i < poly.numInteriorRings(); ++i ) { - transform( poly.interiorRingN( i ) ); - } + for ( size_t i = 0; i < poly.numInteriorRings(); ++i ) { + transform( poly.interiorRingN( i ) ); + } } /// /// /// -void AffineTransform3::transform( PolyhedralSurface& surf ) { - for ( size_t i = 0; i < surf.numPolygons(); ++i ) { - transform( surf.polygonN( i ) ); - } +void AffineTransform3::transform( PolyhedralSurface& surf ) +{ + for ( size_t i = 0; i < surf.numPolygons(); ++i ) { + transform( surf.polygonN( i ) ); + } } /// /// /// -void AffineTransform3::transform( TriangulatedSurface& surf ) { - for ( size_t i = 0; i < surf.numGeometries(); ++i ) { - transform( surf.geometryN( i ) ); - } +void AffineTransform3::transform( TriangulatedSurface& surf ) +{ + for ( size_t i = 0; i < surf.numGeometries(); ++i ) { + transform( surf.geometryN( i ) ); + } } /// /// /// -void AffineTransform3::transform( Solid& solid ) { - transform( solid.exteriorShell() ); +void AffineTransform3::transform( Solid& solid ) +{ + transform( solid.exteriorShell() ); - for ( size_t i = 0; i < solid.numInteriorShells(); ++i ) { - transform( solid.interiorShellN( i ) ); - } + for ( size_t i = 0; i < solid.numInteriorShells(); ++i ) { + transform( solid.interiorShellN( i ) ); + } }