From 3ee0c0c938c580b13513921f7c8309dc265d0b51 Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Mon, 12 Oct 2015 09:33:59 +0200
Subject: [PATCH] COV: fixed issues in ossim sentinel1 model
---
.../OssimPlugins/src/ossim/ossimSentinel1Model.cpp | 5 +++++
.../ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h | 1 +
.../OssimPlugins/src/ossim/ossimSentinel1ProductDoc.cpp | 2 +-
.../OssimPlugins/src/ossim/ossimSentinel1ProductDoc.h | 4 ++--
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
index 80d85d1560..e1e5d21f40 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
@@ -14,6 +14,8 @@ namespace ossimplugins
//*************************************************************************************************
ossimSentinel1Model::ossimSentinel1Model()
: ossimSarModel()
+ , theOCN(false)
+ , theSLC(false)
{
theManifestDoc = new ossimXmlDocument();
theProduct = new ossimSentinel1ProductDoc();
@@ -38,6 +40,9 @@ namespace ossimplugins
//*************************************************************************************************
ossimSentinel1Model::ossimSentinel1Model(const ossimSentinel1Model& rhs)
:ossimSarModel(rhs)
+ , theOCN(rhs.isOCN())
+ , theSLC(rhs.isSLC())
+
{
}
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
index ccfa6c4ed8..65b1fdc77e 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
@@ -124,6 +124,7 @@ namespace ossimplugins
}
bool isSLC() { return theSLC; }
+ bool isOCN() { return theOCN; }
bool initSRGR()
{
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.cpp
index b069f6f1a5..6f1ca586fb 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.cpp
@@ -128,7 +128,7 @@ namespace ossimplugins
{
bool commonMetadataRetrieved = false;
double heightSum = 0.0;
- int numBands = 0;
+ int numBands = 1;
ossimDirectory annotationDir( theManifestDirectory.dirCat( "annotation") );
std::vector<ossimFilename> files;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.h
index 22ab04efa2..50b0f5107b 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1ProductDoc.h
@@ -85,12 +85,12 @@ namespace ossimplugins
}
- inline bool setSLC(bool b)
+ inline void setSLC(bool b)
{
theSLC = true;
}
- inline bool setTOPSAR(bool b)
+ inline void setTOPSAR(bool b)
{
theTOPSAR = true;
}
--
GitLab