Date: Sat, 26 Dec 2015 11:40:41 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404505 - head/math/saga/files Message-ID: <201512261140.tBQBefVX001194@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sat Dec 26 11:40:41 2015 New Revision: 404505 URL: https://svnweb.freebsd.org/changeset/ports/404505 Log: - Fix build PR: 205491 Added: head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h (contents, props changed) head/math/saga/files/patch-src_saga__core_saga__api_table.cpp (contents, props changed) head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp (contents, props changed) Deleted: head/math/saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h Added: head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h Sat Dec 26 11:40:41 2015 (r404505) @@ -0,0 +1,12 @@ +--- src/modules/imagery/imagery_opencv/opencv.h.orig 2015-12-21 09:38:29 UTC ++++ src/modules/imagery/imagery_opencv/opencv.h +@@ -74,7 +74,8 @@ + + //--------------------------------------------------------- + #include <opencv/cv.h> +- ++#include <opencv2/core/core_c.h> ++#include <opencv2/imgproc/imgproc_c.h> + + /////////////////////////////////////////////////////////// + // // Added: head/math/saga/files/patch-src_saga__core_saga__api_table.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_saga__core_saga__api_table.cpp Sat Dec 26 11:40:41 2015 (r404505) @@ -0,0 +1,11 @@ +--- src/saga_core/saga_api/table.cpp.orig 2015-12-21 09:38:29 UTC ++++ src/saga_core/saga_api/table.cpp +@@ -175,7 +175,7 @@ bool CSG_Table::Create(const CSG_String + SG_UI_Msg_Add(CSG_String::Format("%s: %s...", _TL("Load table"), File_Name.c_str()), true); + + //----------------------------------------------------- +- bool bResult = File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, NULL); ++ bool bResult = File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, '\0'); + + if( bResult ) + { Added: head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_saga__core_saga__api_table__io.cpp Sat Dec 26 11:40:41 2015 (r404505) @@ -0,0 +1,11 @@ +--- src/saga_core/saga_api/table_io.cpp.orig 2015-12-21 09:38:29 UTC ++++ src/saga_core/saga_api/table_io.cpp +@@ -118,7 +118,7 @@ bool CSG_Table::Load(const CSG_String &F + //--------------------------------------------------------- + bool CSG_Table::Save(const CSG_String &File_Name, int Format) + { +- return( Save(File_Name, Format, NULL) ); ++ return( Save(File_Name, Format, '\0') ); + } + + //---------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512261140.tBQBefVX001194>