Attachment #166535 for bug #206907

View | Details | Raw Unified | Return to bug 206907
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sfcgal	4	PORTNAME= sfcgal
5	PORTVERSION= 1.1.0	5	PORTVERSION= 1.2.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= databases math graphics	7	CATEGORIES= databases math graphics
8		8

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 00e1bde3e1353592700bcc36d62cb31fec3b61c31c0fb93a0c74873bccf7b102	1	SHA256 (Oslandia-SFCGAL-v1.2.2_GH0.tar.gz) = dae7de4c7e1b4ef2a51c55f7d201a6d8049b518caac14f4033fd2d43f14eb031
2	SIZE (Oslandia-SFCGAL-v1.1.0_GH0.tar.gz) = 2393394	2	SIZE (Oslandia-SFCGAL-v1.2.2_GH0.tar.gz) = 2411074




--- src/detail/GeometrySet.cpp.orig	2015-01-14 13:59:05 UTC
+++ src/detail/GeometrySet.cpp
@@ -557,10 +557,10 @@ void recompose_points( const typename Ge
 
 // compare less than
 struct ComparePoints {
-    bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) {
+    bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) const {
         return lhs.x() < rhs.x() || lhs.y() < rhs.y();
     }
-    bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) {
+    bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) const {
         return lhs.x() < rhs.x() || lhs.y() < rhs.y() || lhs.z() < rhs.z();
     }
 };

Lines 60-65 Link Here

(-)pkg-plist (-1 / +2 lines)
60	include/SFCGAL/detail/GeometrySet.h	60	include/SFCGAL/detail/GeometrySet.h
61	include/SFCGAL/detail/GetPointsVisitor.h	61	include/SFCGAL/detail/GetPointsVisitor.h
62	include/SFCGAL/detail/Interval.h	62	include/SFCGAL/detail/Interval.h
		63	include/SFCGAL/detail/Point_inside_polyhedron.h
63	include/SFCGAL/detail/TestGeometry.h	64	include/SFCGAL/detail/TestGeometry.h
64	include/SFCGAL/detail/TypeForDimension.h	65	include/SFCGAL/detail/TypeForDimension.h
65	include/SFCGAL/detail/algorithm/coversPoints.h	66	include/SFCGAL/detail/algorithm/coversPoints.h
Lines 106-109 Link Here
106	include/SFCGAL/version.h	107	include/SFCGAL/version.h
107	lib/libSFCGAL.so	108	lib/libSFCGAL.so
108	lib/libSFCGAL.so.1	109	lib/libSFCGAL.so.1
109	lib/libSFCGAL.so.1.1.0	110	lib/libSFCGAL.so.1.2.2

Return to bug 206907

Lines 1-15 Link Here

(-)files/patch-src-detail-GeometrySet.cpp (-15 lines)
1	--- src/detail/GeometrySet.cpp.orig 2015-01-14 13:59:05 UTC
2	+++ src/detail/GeometrySet.cpp
3	@@ -557,10 +557,10 @@ void recompose_points( const typename Ge
4
5	// compare less than
6	struct ComparePoints {
7	- bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) {
8	+ bool operator()( const CGAL::Point_2<Kernel>& lhs, const CGAL::Point_2<Kernel>& rhs ) const {
9	return lhs.x() < rhs.x() \|\| lhs.y() < rhs.y();
10	}
11	- bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) {
12	+ bool operator()( const CGAL::Point_3<Kernel>& lhs, const CGAL::Point_3<Kernel>& rhs ) const {
13	return lhs.x() < rhs.x() \|\| lhs.y() < rhs.y() \|\| lhs.z() < rhs.z();
14	}
15	};