Attachment 155831 Details for Bug 199600 – fix

[patch] fix

gcc.diff (text/plain), 1.82 KB, created by Jan Beich on 2015-04-22 06:18:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-04-22 06:18:01 UTC

Size: 1.82 KB

patch

obsolete

>Index: math/saga/Makefile
>===================================================================
>--- math/saga/Makefile	(revision 384420)
>+++ math/saga/Makefile	(working copy)
>@@ -31,6 +31,7 @@ CFLAGS+=	-I${LOCALBASE}/include
> GNU_CONFIGURE=	yes
> LDFLAGS+=	-L${LOCALBASE}/lib -lopencv_contrib
> USE_LDCONFIG=	yes
>+USE_CXXSTD=	c++11
> USE_WX=		3.0+
> USES=		autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>Index: math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp
>===================================================================
>--- math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp	(revision 0)
>+++ math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp	(working copy)
>@@ -0,0 +1,21 @@
>+--- src/modules/io/io_shapes_las/las_export.cpp.orig	2014-01-09 10:24:11 UTC
>++++ src/modules/io/io_shapes_las/las_export.cpp
>+@@ -333,12 +333,12 @@ bool CLAS_Export::On_Execute(void)
>+ 		y	= pPoints->Get_Y(i);
>+ 		z	= pPoints->Get_Z(i);
>+ 
>+-		x < xmin ? xmin = x : NULL;
>+-		x > xmax ? xmax = x : NULL;
>+-		y < ymin ? ymin = y : NULL;
>+-		y > ymax ? ymax = y : NULL;
>+-		z < zmin ? zmin = z : NULL;
>+-		z > zmax ? zmax = z : NULL;
>++		x < xmin ? xmin = x : 0.0;
>++		x > xmax ? xmax = x : 0.0;
>++		y < ymin ? ymin = y : 0.0;
>++		y > ymax ? ymax = y : 0.0;
>++		z < zmin ? zmin = z : 0.0;
>++		z > zmax ? zmax = z : 0.0;
>+ 
>+ 		point.SetCoordinates(x, y, z);
>+ 
>
>Property changes on: math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

jbeich: maintainer-approval? (rhurlin)

Actions: View | Diff

Attachments on bug 199600: 155831 | 155832 | 155836