From aca77cd9a698a9ebb0704281b31205ce4038fce1 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Thu, 13 Aug 2009 13:32:07 +0200
Subject: [PATCH] BUG: replace or by || operator in if condition
---
Utilities/otbossimplugins/ossim/ossimErsSarModel.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Utilities/otbossimplugins/ossim/ossimErsSarModel.cpp b/Utilities/otbossimplugins/ossim/ossimErsSarModel.cpp
index 0dad12449c..d84651a82c 100644
--- a/Utilities/otbossimplugins/ossim/ossimErsSarModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimErsSarModel.cpp
@@ -213,9 +213,7 @@ bool ossimErsSarModel::saveState(ossimKeywordlist& kwl,
ossimNotify(ossimNotifyLevel_DEBUG)<< MODULE << " entered...\n";
}
- bool result;
-
- char name[64];
+ bool result(false);
//kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimErsSarModel", true);
@@ -621,12 +619,12 @@ bool ossimErsSarModel::isErsLeader(const ossimFilename& file) const
char ersFileName[16];
candidate.seekg(48);
- if ( candidate.bad() or candidate.eof() )
+ if ( candidate.bad() || candidate.eof() )
{
return false;
}
candidate.read(ersFileName, 16);
- if ( candidate.bad() or candidate.eof() )
+ if ( candidate.bad() || candidate.eof() )
{
return false;
}
--
GitLab