[saga] 01/02: Add patch to fix projections with gcc 6
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Mon Sep 26 23:59:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit aac68ab8a74adab74438050aebee0fb1d1ada5b4
Author: Johan Van de Wauw <johan at vandewauw.be>
Date: Tue Sep 27 01:29:37 2016 +0200
Add patch to fix projections with gcc 6
---
debian/patches/Fix_projections_gcc6.patch | 135 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 136 insertions(+)
diff --git a/debian/patches/Fix_projections_gcc6.patch b/debian/patches/Fix_projections_gcc6.patch
new file mode 100644
index 0000000..74bc916
--- /dev/null
+++ b/debian/patches/Fix_projections_gcc6.patch
@@ -0,0 +1,135 @@
+From f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3 Mon Sep 17 00:00:00 2001
+Applied-Upstream: https://sourceforge.net/p/saga-gis/code/ci/f3c103afb8be0e3fc79c0777ae9bfbd7d3ebdca3/
+From: oconrad <conrad at geowiss.uni-hamburg.de>
+Date: Thu, 18 Aug 2016 13:01:36 +0200
+Subject: saga_api, CSG_MetaData, gcc v6 compatibility: is_valid() function
+ removed (you can use () operator to check if a child entry with given name
+ exists)
+
+
+diff --git a/saga-gis/src/saga_core/saga_api/metadata.cpp b/saga-gis/src/saga_core/saga_api/metadata.cpp
+index 030be0c..4e2f135 100644
+--- a/src/saga_core/saga_api/metadata.cpp
++++ b/src/saga_core/saga_api/metadata.cpp
+@@ -174,17 +174,6 @@ void CSG_MetaData::Destroy(void)
+ ///////////////////////////////////////////////////////////
+
+ //---------------------------------------------------------
+-bool CSG_MetaData::is_Valid(void) const
+-{
+- return( this != NULL );
+-}
+-
+-
+-///////////////////////////////////////////////////////////
+-// //
+-///////////////////////////////////////////////////////////
+-
+-//---------------------------------------------------------
+ CSG_MetaData * CSG_MetaData::Add_Child(void)
+ {
+ return( Ins_Child(-1) );
+diff --git a/saga-gis/src/saga_core/saga_api/metadata.h b/saga-gis/src/saga_core/saga_api/metadata.h
+index 905a668..858be49 100644
+--- a/src/saga_core/saga_api/metadata.h
++++ b/src/saga_core/saga_api/metadata.h
+@@ -157,8 +157,6 @@ public:
+ const CSG_MetaData & operator [] (int Index) const { return( *Get_Child(Index ) ); }
+ const CSG_MetaData & operator [] (const CSG_String &Name) const { return( *Get_Child(_Get_Child(Name)) ); }
+
+- bool is_Valid (void) const;
+-
+ int Get_Property_Count (void) const { return( m_Prop_Names.Get_Count() ); }
+ const CSG_String & Get_Property_Name (int i) const { return( m_Prop_Names [i] ); }
+ const SG_Char * Get_Property (int i) const { return( i >= 0 && i < m_Prop_Values.Get_Count() ? m_Prop_Values[i].c_str() : NULL ); }
+diff --git a/saga-gis/src/saga_core/saga_api/projections.cpp b/saga-gis/src/saga_core/saga_api/projections.cpp
+index d84d386..638c0da 100644
+--- a/src/saga_core/saga_api/projections.cpp
++++ b/src/saga_core/saga_api/projections.cpp
+@@ -220,7 +220,7 @@ double SG_Get_Projection_Unit_To_Meter (TSG_Projection_Unit Unit)
+ //---------------------------------------------------------
+ bool SG_Set_Projection_Unit (const CSG_MetaData &m, TSG_Projection_Unit &Unit, CSG_String &Name, double &To_Meter)
+ {
+- if( m["UNIT"].is_Valid() )
++ if( m("UNIT") )
+ {
+ if( m["UNIT"].Get_Property("name", Name) && (Unit = SG_Get_Projection_Unit(Name)) != SG_PROJ_UNIT_Undefined )
+ {
+@@ -1042,8 +1042,8 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ // ]
+ if( !m.Get_Name().Cmp("GEOGCS") )
+ {
+- if( !m["DATUM"].is_Valid()
+- || !m["DATUM"]["SPHEROID"].is_Valid()
++ if( !m("DATUM")
++ || !m["DATUM"]("SPHEROID")
+ || m["DATUM"]["SPHEROID"].Get_Children_Count() != 2
+ || !m["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
+ || !m["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
+@@ -1056,7 +1056,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ Proj4 += CSG_String::Format(SG_T(" +a=%f"), a); // Semimajor radius of the ellipsoid axis
+ Proj4 += CSG_String::Format(SG_T(" +b=%f"), d > 0.0 ? a - a / d : a); // Semiminor radius of the ellipsoid axis
+
+- if( m["DATUM"]["TOWGS84"].is_Valid() && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
++ if( m["DATUM"]("TOWGS84") && m["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ {
+ for(i=0; i<7; i++)
+ {
+@@ -1064,7 +1064,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ }
+ }
+
+- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
++ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ {
+ Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
+ }
+@@ -1090,7 +1090,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ // ]
+ if( !m.Get_Name().Cmp(SG_T("PROJCS")) )
+ {
+- if( !m["PROJECTION"].is_Valid() )
++ if( !m("PROJECTION") )
+ {
+ SG_UI_Msg_Add_Error(CSG_String::Format(SG_T(">> WKT: %s"), _TL("no projection specified")));
+
+@@ -1104,9 +1104,9 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ return( false );
+ }
+
+- if( !m["GEOGCS"].is_Valid()
+- || !m["GEOGCS"]["DATUM"].is_Valid()
+- || !m["GEOGCS"]["DATUM"]["SPHEROID"].is_Valid()
++ if( !m("GEOGCS")
++ || !m["GEOGCS"]("DATUM")
++ || !m["GEOGCS"]["DATUM"]("SPHEROID")
+ || m["GEOGCS"]["DATUM"]["SPHEROID"].Get_Children_Count() != 2
+ || !m["GEOGCS"]["DATUM"]["SPHEROID"][0].Get_Content().asDouble(a) || a <= 0.0
+ || !m["GEOGCS"]["DATUM"]["SPHEROID"][1].Get_Content().asDouble(d) || d < 0.0 )
+@@ -1121,7 +1121,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ Proj4 += CSG_String::Format(SG_T(" +a=%f"), a);
+ Proj4 += CSG_String::Format(SG_T(" +b=%f"), d <= 0.0 ? a : a - a / d); // Semiminor radius of the ellipsoid axis
+
+- if( m["GEOGCS"]["DATUM"]["TOWGS84"].is_Valid() && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
++ if( m["GEOGCS"]["DATUM"]("TOWGS84") && m["GEOGCS"]["DATUM"]["TOWGS84"].Get_Children_Count() == 7 )
+ {
+ for(i=0; i<7; i++)
+ {
+@@ -1129,7 +1129,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ }
+ }
+
+- if( m["PRIMEM"].is_Valid() && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
++ if( m("PRIMEM") && m["PRIMEM"].Get_Content().asDouble(d) && d != 0.0 )
+ {
+ Proj4 += CSG_String::Format(SG_T(" +pm=%f"), d);
+ }
+@@ -1149,7 +1149,7 @@ bool CSG_Projections::WKT_to_Proj4(CSG_String &Proj4, const CSG_String &WKT) con
+ }
+ }
+
+- if( m["UNIT"].is_Valid() && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
++ if( m("UNIT") && m["UNIT"].Get_Content().asDouble(d) && d != 0.0 && d != 1.0 )
+ {
+ Proj4 += CSG_String::Format(SG_T(" +to_meter=%f"), d);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 8609d3e..ec78be2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Use-debian-version-of-libsvm.patch
0001-vigra-hdf5-include.patch
Use-pkg-config-for-Debian-version-of-dxflib.patch
disable-imagery_isocluster.patch
+Fix_projections_gcc6.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git
More information about the Pkg-grass-devel
mailing list