From ec82dc6fa6edf3460ca8d35f660ea9fbcda8f92c Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 12 Aug 2019 14:36:27 +0200
Subject: [PATCH] COMP: missing std:: in OssimPlugins
---
.../src/gdal/ossimOgcWktTranslator.cpp | 20 ++++-----
.../src/ossim/ossimAlosPalsarModel.cpp | 8 ++--
.../src/ossim/ossimCosmoSkymedModel.cpp | 6 +--
.../src/ossim/ossimEnvisatAsarModel.cpp | 4 +-
.../src/ossim/ossimErsSarModel.cpp | 8 ++--
.../ossim/ossimFormosatDimapSupportData.cpp | 16 +++----
.../src/ossim/ossimFormosatDimapSupportData.h | 2 +-
.../src/ossim/ossimFormosatModel.cpp | 14 +++---
.../src/ossim/ossimFormosatModel.h | 2 +-
.../ossim/ossimGeometricSarSensorModel.cpp | 10 ++---
.../src/ossim/ossimGeometricSarSensorModel.h | 2 +-
.../ossim/ossimPleiadesDimapSupportData.cpp | 28 ++++++------
.../src/ossim/ossimPleiadesDimapSupportData.h | 2 +-
.../src/ossim/ossimPleiadesModel.cpp | 6 +--
.../src/ossim/ossimRadarSat2Model.cpp | 6 +--
.../src/ossim/ossimRadarSat2ProductDoc.cpp | 44 +++++++++----------
.../src/ossim/ossimRadarSatModel.cpp | 42 +++++++++---------
.../src/ossim/ossimSentinel1Model.cpp | 12 ++---
.../src/ossim/ossimSpot6DimapSupportData.cpp | 26 +++++------
.../src/ossim/ossimSpot6DimapSupportData.h | 2 +-
.../src/ossim/ossimSpot6Model.cpp | 6 +--
.../src/ossim/ossimTerraSarModel.cpp | 6 +--
.../src/ossim/ossimTerraSarModel.h | 2 +-
.../src/ossim/ossimTileMapModel.cpp | 8 ++--
.../src/ossim/ossimTileMapModel.h | 2 +-
.../src/ossim/otb/IncidenceAngles.cpp | 2 +-
.../OssimPlugins/src/ossim/otb/Noise.cpp | 2 +-
.../src/ossim/otb/RadarSat2NoiseLevel.cpp | 2 +-
.../OssimPlugins/src/ossim/otb/SceneCoord.cpp | 2 +-
29 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp b/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp
index 6f2f0289ca..91f433d657 100644
--- a/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp
@@ -128,7 +128,7 @@ ossimString ossimOgcWktTranslator::fromOssimKwl(const ossimKeywordlist &kwl,
<< ": "
<< ( ossimUnitTypeLut::instance()->
getEntryString(units).c_str() )
- << endl;
+ << std::endl;
break;
}
} // End of switch (units)
@@ -491,11 +491,11 @@ ossimString ossimOgcWktTranslator::fromOssimKwl(const ossimKeywordlist &kwl,
}
else
{
- cerr << "ossimOgcWktTranslator::fromOssimKwl:\n"
+ std::cerr << "ossimOgcWktTranslator::fromOssimKwl:\n"
<< "Projection translation for "
<< projType
<< " not supported "
- << endl;
+ << std::endl;
}
if(pcsCodeVal >= EPSG_CODE_MAX)
@@ -532,10 +532,10 @@ ossimString ossimOgcWktTranslator::fromOssimKwl(const ossimKeywordlist &kwl,
}
else
{
- cerr << "ossimOgcWktTranslator::fromOssimKwl: Datum translation for "
+ std::cerr << "ossimOgcWktTranslator::fromOssimKwl: Datum translation for "
<< datumType
<<" not supported"
- << endl;
+ << std::endl;
}
}
@@ -700,7 +700,7 @@ bool ossimOgcWktTranslator::toOssimKwl( const ossimString& wktString,
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< MODULE << "DEBUG:"
- << "\nossimProj = " << ossimProj << endl;
+ << "\nossimProj = " << ossimProj << std::endl;
}
kwl.add(prefix, ossimKeywordNames::TYPE_KW, ossimProj.c_str(), true);
@@ -916,7 +916,7 @@ bool ossimOgcWktTranslator::toOssimKwl( const ossimString& wktString,
<< "Projection conversion to OSSIM not supported !!!!!!!!!\n"
<< "Please send the following string to the development staff\n"
<< "to be added to the transaltion to OSSIM\n"
- << wkt << endl;
+ << wkt << std::endl;
}
return false;
}
@@ -1055,7 +1055,7 @@ ossimString ossimOgcWktTranslator::wktToOssimDatum(const ossimString& datum)cons
ossimString ossimOgcWktTranslator::ossimToWktDatum(const ossimString& datum)const
{
ossimString result;
- map<std::string, std::string>::const_iterator i = theOssimToWktDatumTranslation.find(datum);
+ std::map<std::string, std::string>::const_iterator i = theOssimToWktDatumTranslation.find(datum);
if(i != theOssimToWktDatumTranslation.end())
{
result = (*i).second;
@@ -1066,7 +1066,7 @@ ossimString ossimOgcWktTranslator::ossimToWktDatum(const ossimString& datum)cons
ossimString ossimOgcWktTranslator::wktToOssimProjection(const ossimString& datum)const
{
std::string result;
- map<std::string, std::string>::const_iterator i =
+ std::map<std::string, std::string>::const_iterator i =
theWktToOssimProjectionTranslation.find(datum);
if(i != theWktToOssimProjectionTranslation.end())
{
@@ -1078,7 +1078,7 @@ ossimString ossimOgcWktTranslator::wktToOssimProjection(const ossimString& datum
ossimString ossimOgcWktTranslator::ossimToWktProjection(const ossimString& datum)const
{
ossimString result;
- map<std::string, std::string>::const_iterator i =
+ std::map<std::string, std::string>::const_iterator i =
theOssimToWktProjectionTranslation.find(datum);
if(i != theOssimToWktProjectionTranslation.end())
{
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimAlosPalsarModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimAlosPalsarModel.cpp
index 215d10d7ee..b9986ffb17 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimAlosPalsarModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimAlosPalsarModel.cpp
@@ -217,7 +217,7 @@ namespace ossimplugins
/*
* Leader file data reading
*/
- std::ifstream leaderFile(leaFilename.c_str(), ios::in | ios::binary);
+ std::ifstream leaderFile(leaFilename.c_str(), std::ios::in | std::ios::binary);
leaderFile >> *theAlosPalsarLeader;
leaderFile.close();
@@ -241,7 +241,7 @@ namespace ossimplugins
/*
* Read header of data file for image size info
*/
- std::ifstream dataFile(datFilename.c_str(), ios::in | ios::binary);
+ std::ifstream dataFile(datFilename.c_str(), std::ios::in | std::ios::binary);
dataFile >> *theAlosPalsarData;
dataFile.close();
@@ -682,7 +682,7 @@ namespace ossimplugins
bool ossimAlosPalsarModel::isAlosPalsarLeader(const ossimFilename& file) const
{
- std::ifstream candidate(file.c_str(), ios::in | ios::binary);
+ std::ifstream candidate(file.c_str(), std::ios::in | std::ios::binary);
char alosFileName[16];
candidate.seekg(48);
@@ -745,7 +745,7 @@ namespace ossimplugins
bool ossimAlosPalsarModel::isAlosPalsarData(const ossimFilename& file) const
{
- std::ifstream candidate(file.c_str(), ios::in | ios::binary);
+ std::ifstream candidate(file.c_str(), std::ios::in | std::ios::binary);
char alosFileName[16];
candidate.seekg(48);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
index b11d6dc1fd..ca9d72ece5 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimCosmoSkymedModel.cpp
@@ -119,14 +119,14 @@ namespace ossimplugins
// Capture stream flags since we are going to mess with them.
std::ios_base::fmtflags f = out.flags();
- out << "\nDump of ossimCosmoSkymedModel at address " << hex << this
- << dec
+ out << "\nDump of ossimCosmoSkymedModel at address " << std::hex << this
+ << std::dec
<< "\n------------------------------------------------"
<< "\n theImageID = " << theImageID
<< "\n theImageSize = " << theImageSize
<< "\n------------------------------------------------"
- << "\n " << endl;
+ << "\n " << std::endl;
// Set the flags back.
out.flags(f);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
index a2b8c4c5e7..d04f06725e 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimEnvisatAsarModel.cpp
@@ -125,7 +125,7 @@ namespace ossimplugins
* Opening and test of the file
*/
ossimFilename Filename = file;
- ifstream dataFile(Filename.c_str(), ios::in | ios::binary);
+ std::ifstream dataFile(Filename.c_str(), std::ios::in | std::ios::binary);
if (dataFile.eof())
{
dataFile.close();
@@ -368,7 +368,7 @@ namespace ossimplugins
// Capture the original flags.
std::ios_base::fmtflags f = out.flags();
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\nossimEnvisatAsarModel data members:\n"
<< "_pixel_spacing: " << _pixel_spacing << "\n"
<< "_n_srgr: " << _n_srgr << "\n";
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimErsSarModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimErsSarModel.cpp
index d781754df8..446f09d415 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimErsSarModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimErsSarModel.cpp
@@ -195,7 +195,7 @@ namespace ossimplugins
/*
* Leader file data reading
*/
- std::ifstream leaderFile(leaFilename.c_str(), ios::in | ios::binary);
+ std::ifstream leaderFile(leaFilename.c_str(), std::ios::in | std::ios::binary);
leaderFile >> *theErsSarleader;
leaderFile.close();
@@ -613,8 +613,8 @@ namespace ossimplugins
ossimString filename(kwl.find("filename"));
filename.upcase();
//std::transform(filename.begin(), filename.end(), filename.begin(), toupper);
- string::size_type loc = filename.find("PRI");
- if (loc != string::npos)
+ std::string::size_type loc = filename.find("PRI");
+ if (loc != std::string::npos)
{
_isProductGeoreferenced = true;
}
@@ -646,7 +646,7 @@ namespace ossimplugins
bool ossimErsSarModel::isErsLeader(const ossimFilename& file) const
{
- std::ifstream candidate(file.c_str(), ios::in | ios::binary);
+ std::ifstream candidate(file.c_str(), std::ios::in | std::ios::binary);
char ersFileName[16];
candidate.seekg(48);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp
index 43ae793f91..0aab7c5bc2 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp
@@ -326,7 +326,7 @@ bool ossimFormosatDimapSupportData::loadXmlFile(const ossimFilename& file)
//---
// Check that it is a FORMOSAT DIMAP file format
//---
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
xml_nodes.clear();
ossimString xpath = "/Dimap_Document/Dataset_Sources/Source_Information/Scene_Source/MISSION";
xmlDocument->findNodes(xpath, xml_nodes);
@@ -803,7 +803,7 @@ void ossimFormosatDimapSupportData::getGeoPosPoint (ossim_uint32 point,
}
}
-void ossimFormosatDimapSupportData::printInfo(ostream& os) const
+void ossimFormosatDimapSupportData::printInfo(std::ostream& os) const
{
ossimString corr_att = "NO";
if (theStarTrackerUsed)
@@ -1522,7 +1522,7 @@ bool ossimFormosatDimapSupportData::parsePart1(
static const char MODULE[] = "ossimFormosatDimapSupportData::parsePart1";
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the ImageSize:
@@ -2351,7 +2351,7 @@ bool ossimFormosatDimapSupportData::initMetadataVersion(ossimRefPtr<ossimXmlDocu
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG:\nCould not find: " << xpath
- << endl;
+ << std::endl;
}
return false;
}
@@ -2386,7 +2386,7 @@ bool ossimFormosatDimapSupportData::initImageId(
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the Image ID:
@@ -2400,7 +2400,7 @@ bool ossimFormosatDimapSupportData::initImageId(
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG:\nCould not find: " << xpath
- << endl;
+ << std::endl;
}
return false;
}
@@ -2412,7 +2412,7 @@ bool ossimFormosatDimapSupportData::initSceneSource(
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the mission index (Formosat 1 or 2):
@@ -2591,7 +2591,7 @@ bool ossimFormosatDimapSupportData::initFramePoints(
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Corner points:
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h
index c8146ba259..a63dfc7da6 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h
@@ -162,7 +162,7 @@ public:
//---
// Convenient method to print important image info:
//---
- void printInfo (ostream& os) const;
+ void printInfo (std::ostream& os) const;
virtual bool saveState(ossimKeywordlist& kwl,
const char* prefix = 0)const;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp
index c6aa8a2415..212fd1e5b3 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp
@@ -472,8 +472,8 @@ std::ostream& ossimplugins::ossimFormosatModel::print(std::ostream& out) const
// Capture stream flags since we are going to mess with them.
std::ios_base::fmtflags f = out.flags();
- out << "\nDump of ossimFormosatModel at address " << (hex) << this
- << (dec)
+ out << "\nDump of ossimFormosatModel at address " << (std::hex) << this
+ << (std::dec)
<< "\n------------------------------------------------"
<< "\n theImageID = " << theImageID
<< "\n theMetadataFile = " << theMetaDataFile
@@ -495,7 +495,7 @@ std::ostream& ossimplugins::ossimFormosatModel::print(std::ostream& out) const
<< "\n theYawRate = " << theYawRate
<< "\n theFocalLenOffset = " << theFocalLenOffset
<< "\n------------------------------------------------"
- << "\n " << endl;
+ << "\n " << std::endl;
// Set the flags back.
out.flags(f);
@@ -596,14 +596,14 @@ void ossimplugins::ossimFormosatModel::imagingRay(const ossimDpt& image_point,
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG:\n\t Psi_x = " << Psi_x
- << "\n\t Psi_y = " << Psi_y << endl;
+ << "\n\t Psi_y = " << Psi_y << std::endl;
}
ossimColumnVector3d u_sat (-tan(Psi_y), tan(Psi_x), -(1.0 + theFocalLenOffset));
if (traceDebug() || runtime_dbflag)
{
ossimNotify(ossimNotifyLevel_DEBUG)
- << "DEBUG \n\t u_sat = " << u_sat << endl;
+ << "DEBUG \n\t u_sat = " << u_sat << std::endl;
}
//
@@ -617,7 +617,7 @@ void ossimplugins::ossimFormosatModel::imagingRay(const ossimDpt& image_point,
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG:\n\t theSatToOrbRotation = " << satToOrbit
- << "\n\t u_orb = " << u_orb << endl;
+ << "\n\t u_orb = " << u_orb << std::endl;
}
//
@@ -648,7 +648,7 @@ void ossimplugins::ossimFormosatModel::imagingRay(const ossimDpt& image_point,
{
ossimNotify(ossimNotifyLevel_DEBUG)
<< "DEBUG:\n\t orbToEcfRotation = " << orbToEcfRotation
- << "\n\t u_ecf = " << u_ecf << endl;
+ << "\n\t u_ecf = " << u_ecf << std::endl;
}
//
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.h
index e2b335345d..d080c7524d 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.h
@@ -94,7 +94,7 @@ public:
* Writes a template of geom keywords processed by loadState and saveState
* to output stream.
*/
- static void writeGeomTemplate(ostream& os);
+ static void writeGeomTemplate(std::ostream& os);
/*!
* Given an image point and height, initializes worldPoint.
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.cpp
index 5b1d2d08e1..73632e755f 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.cpp
@@ -133,7 +133,7 @@ namespace ossimplugins
return time;
}
- bool ossimGeometricSarSensorModel::getPlatformPositionAtLine(double line, vector<double>& position, vector<double>& speed)
+ bool ossimGeometricSarSensorModel::getPlatformPositionAtLine(double line, std::vector<double>& position, std::vector<double>& speed)
{
JSDDateTime time = getTime(line);
return _platformPosition->getPlatformPositionAtTime(time,position,speed);
@@ -532,13 +532,13 @@ namespace ossimplugins
// if (result)
// {
// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "calling saveState to verify loadState..." << endl;
+// << "calling saveState to verify loadState..." << std::endl;
// ossimKeywordlist kwl2;
// saveState(kwl2, 0);
// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "saveState result after loadState:" << kwl2 << endl;
+// << "saveState result after loadState:" << kwl2 << std::endl;
// }
if (traceDebug())
@@ -574,7 +574,7 @@ namespace ossimplugins
std::ostream& ossimGeometricSarSensorModel::print(std::ostream& out) const
{
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\nossimGeometricSarSensorModel class data members:\n";
const char* prefix = 0;
@@ -631,7 +631,7 @@ bool ossimGeometricSarSensorModel::createReplacementOCG()
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_NOTICE)<<"\nComputing coarse grid..."<<endl;
+ ossimNotify(ossimNotifyLevel_NOTICE)<<"\nComputing coarse grid..."<<std::endl;
}
_replacementOcgModel->buildGrid(theImageClipRect, this, 500.00, true, false);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.h
index 40f33c522a..967b289e95 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimGeometricSarSensorModel.h
@@ -118,7 +118,7 @@ public:
* @param position Position of the sensor at line line
* @param speed Speed of the sensor at line line
*/
- virtual bool getPlatformPositionAtLine(double line, vector<double>& position, vector<double>& speed);
+ virtual bool getPlatformPositionAtLine(double line, std::vector<double>& position, std::vector<double>& speed);
/**
* @brief This function is able to convert image coordinates into world
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
index aa0691d810..fe0de3e05b 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.cpp
@@ -99,7 +99,7 @@ namespace ossimplugins
ossimString xpath,
ossimString& nodeValue)
{
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
xmlDocument->findNodes(xpath, xml_nodes);
if (xml_nodes.size() == 0)
@@ -286,7 +286,7 @@ namespace ossimplugins
theSwathLastCol = 0;
}
- void ossimPleiadesDimapSupportData::printInfo(ostream& os) const
+ void ossimPleiadesDimapSupportData::printInfo(std::ostream& os) const
{
os << "\n----------------- Info on Pleiades Image -------------------"
@@ -1249,7 +1249,7 @@ namespace ossimplugins
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the Image ID:
@@ -1292,7 +1292,7 @@ namespace ossimplugins
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Corner points:
@@ -1574,7 +1574,7 @@ namespace ossimplugins
{
static const char MODULE[] = "ossimPleiadesDimapSupportData::parseRPCMetadata";
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the Global RFM - Direct Model - Bias:
@@ -1919,7 +1919,7 @@ namespace ossimplugins
{
// static const char MODULE[] = "ossimPleiadesDimapSupportData::parseMetadataIdentification";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
theXmlDocumentRoot = "/PHR_Dimap_Document";
@@ -1971,7 +1971,7 @@ namespace ossimplugins
{
// static const char MODULE[] = "ossimPleiadesDimapSupportData::parseMetadataIdentification";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
theXmlDocumentRoot = "/DIMAP_Document";
@@ -1990,7 +1990,7 @@ namespace ossimplugins
theXmlDocumentRoot = "/PHR_DIMAP_Document";
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the old root: " << theXmlDocumentRoot << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the old root: " << theXmlDocumentRoot << std::endl;
}
xml_nodes.clear();
@@ -2005,7 +2005,7 @@ namespace ossimplugins
theXmlDocumentRoot = "/Dimap_Document";
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the new root: " << theXmlDocumentRoot << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the new root: " << theXmlDocumentRoot << std::endl;
}
xml_nodes.clear();
@@ -2017,7 +2017,7 @@ namespace ossimplugins
setErrorStatus();
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nCould not find: " << xpath << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nCould not find: " << xpath << std::endl;
}
return false;
}
@@ -2113,7 +2113,7 @@ namespace ossimplugins
{
// static const char MODULE[] = "ossimPleiadesDimapSupportData::parseProcessingInformation";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
//---
@@ -2156,7 +2156,7 @@ namespace ossimplugins
bool ossimPleiadesDimapSupportData::parseRasterData(ossimRefPtr<ossimXmlDocument> xmlDocument)
{
static const char MODULE[] = "ossimPleiadesDimapSupportData::parseRasterData";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
//---
// Fetch if the product file is linked to one or many JP2 files:
@@ -2471,7 +2471,7 @@ namespace ossimplugins
bool ossimPleiadesDimapSupportData::parseGeometricData(ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
xml_nodes.clear();
if (theDIMAPVersion == OSSIM_PLEIADES_DIMAPv1)
@@ -2760,7 +2760,7 @@ namespace ossimplugins
{
// static const char MODULE[] = "ossimPleiadesDimapSupportData::parseDatasetSources";
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the mission index (1A or 1B) ?
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h
index 0eb9e3fb1c..a58259fe61 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h
@@ -82,7 +82,7 @@ namespace ossimplugins
//---
// Convenient method to print important image info:
//---
- void printInfo (ostream& os) const;
+ void printInfo (std::ostream& os) const;
/**
* Method to save the state of the object to a keyword list.
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesModel.cpp
index 0515c186c6..de1148fcdb 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesModel.cpp
@@ -107,8 +107,8 @@ namespace ossimplugins
// Capture stream flags since we are going to mess with them.
std::ios_base::fmtflags f = out.flags();
- out << "\nDump of ossimPleiadesModel at address " << (hex) << this
- << (dec)
+ out << "\nDump of ossimPleiadesModel at address " << (std::hex) << this
+ << (std::dec)
<< "\n------------------------------------------------"
<< "\n theImageID = " << theImageID
<< "\n theImageSize = " << theImageSize
@@ -116,7 +116,7 @@ namespace ossimplugins
<< "\n theRefImgPt = " << theRefImgPt
<< "\n theProcessingLevel = " << theSupportData->getProcessingLevel()
<< "\n------------------------------------------------"
- << "\n " << endl;
+ << "\n " << std::endl;
// Set the flags back.
out.flags(f);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp
index c004e42312..a1c313364f 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp
@@ -115,7 +115,7 @@ double ossimRadarSat2Model::getSlantRangeFromGeoreferenced(double col) const
<< "\n(col-_refPoint->get_pix_col()) "
<< (col-_refPoint->get_pix_col())
<< "\n_refPoint->get_pix_col() : " << _refPoint->get_pix_col()
- << "\n relativeGroundRange : " << relativeGroundRange << endl;
+ << "\n relativeGroundRange : " << relativeGroundRange << std::endl;
}
int numSet = FindSRGRSetNumber((_refPoint->get_ephemeris())->get_date()) ;
@@ -303,7 +303,7 @@ bool ossimRadarSat2Model::open(const ossimFilename& file)
ossimNotify(ossimNotifyLevel_DEBUG)
<< "theImageClipRect : " << theImageClipRect
<< "ul, ur, lr, ll " << ul << ", " << ur
- << ", " << lr << " , " << ll << endl;
+ << ", " << lr << " , " << ll << std::endl;
}
setGroundRect(ul, ur, lr, ll); // ossimSensorModel method.
@@ -328,7 +328,7 @@ std::ostream& ossimRadarSat2Model::print(std::ostream& out) const
// Capture the original flags.
std::ios_base::fmtflags f = out.flags();
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\nossimRadarSat2Model class data members:\n"
<< "_n_srgr: " << _n_srgr << "\n";
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp
index 6e857e58e8..02a67f4d50 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp
@@ -711,10 +711,10 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
double longitudeScale = 0;
double heightScale = 0;
- vector<double> lineNumeratorCoefficients = vector<double>(20,0);
- vector<double> lineDenominatorCoefficients = vector<double>(20,0);
- vector<double> pixelNumeratorCoefficients = vector<double>(20,0);
- vector<double> pixelDenominatorCoefficients = vector<double>(20,0);
+ std::vector<double> lineNumeratorCoefficients = std::vector<double>(20,0);
+ std::vector<double> lineDenominatorCoefficients = std::vector<double>(20,0);
+ std::vector<double> pixelNumeratorCoefficients = std::vector<double>(20,0);
+ std::vector<double> pixelDenominatorCoefficients = std::vector<double>(20,0);
//the final string outputs to the text file
@@ -724,66 +724,66 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
if (rs2Check)
{
if (!ossim::getPath(searchbiasError, xdoc, biasErrorStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
biasError = biasErrorStr.toDouble();
if (!ossim::getPath(searchrandomError, xdoc, randomErrorStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
randomError = randomErrorStr.toDouble();
if (!ossim::getPath(searchlineFitQuality, xdoc, lineFitQualityStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
lineFitQuality = lineFitQualityStr.toDouble();
if (!ossim::getPath(searchpixelFitQuality, xdoc, pixelFitQualityStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
pixelFitQuality = pixelFitQualityStr.toDouble();
if (!ossim::getPath(searchlineOffset, xdoc, lineOffsetStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
lineOffset = lineOffsetStr.toDouble();
if (!ossim::getPath(searchpixelOffset, xdoc, pixelOffsetStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
pixelOffset = pixelOffsetStr.toDouble();
if (!ossim::getPath(searchlatitudeOffset, xdoc, latitudeOffsetStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
latitudeOffset = latitudeOffsetStr.toDouble();
if (!ossim::getPath(searchlongitudeOffset, xdoc, longitudeOffsetStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
longitudeOffset = longitudeOffsetStr.toDouble();
if (!ossim::getPath(searchheightOffset, xdoc, heightOffsetStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
heightOffset = heightOffsetStr.toDouble();
// --------------
if (!ossim::getPath(searchlineScale, xdoc, lineScaleStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
lineScale = lineScaleStr.toDouble();
if (!ossim::getPath(searchpixelScale, xdoc, pixelScaleStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
pixelScale = pixelScaleStr.toDouble();
if (!ossim::getPath(searchlatitudeScale, xdoc, latitudeScaleStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
latitudeScale = latitudeScaleStr.toDouble();
// -----------------------
if (!ossim::getPath(searchlongitudeScale, xdoc, longitudeScaleStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
longitudeScale = longitudeScaleStr.toDouble();
if (!ossim::getPath(searchheightScale, xdoc, heightScaleStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
heightScale = heightScaleStr.toDouble();
// ---- parameters for reading in coeefs ------------
@@ -794,7 +794,7 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
if (!ossim::getPath(searchlineNumeratorCoefficients, xdoc, lineNumeratorCoefficientsStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
string lineNumeratorCoefficientsStr_N = lineNumeratorCoefficientsStr[0];
@@ -810,7 +810,7 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
// ------------------
if (!ossim::getPath(searchlineDenominatorCoefficients, xdoc, lineDenominatorCoefficientsStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
string lineDenominatorCoefficientsStr_N = lineDenominatorCoefficientsStr[0];
@@ -827,7 +827,7 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
// ------------------
if (!ossim::getPath(searchpixelNumeratorCoefficients, xdoc, pixelNumeratorCoefficientsStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
string pixelNumeratorCoefficientsStr_N = pixelNumeratorCoefficientsStr[0];
@@ -843,7 +843,7 @@ RPCModel ossimRadarSat2ProductDoc::getRpcData(const ossimXmlDocument* xdoc) cons
// ------------------
if (!ossim::getPath(searchpixelDenominatorCoefficients, xdoc, pixelDenominatorCoefficientsStr))
- ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << endl;
+ ossimNotify(ossimNotifyLevel_WARN) << "ERROR: UNABLE TO FIND RS2 RPC COEFFICIENT INFORMATION" << std::endl;
string pixelDenominatorCoefficientsStr_N = pixelDenominatorCoefficientsStr[0];
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp
index c859a162ec..a819935573 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp
@@ -158,24 +158,24 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
ossimFilename dataFilePath;
ossimFilename volumeDirectoryFilePath;
std::string input_file = file;
- string::size_type loc_DAT = input_file.find( "DAT_01", 0 );
- string::size_type loc_dat = input_file.find( "dat_01", 0 );
- if ( (loc_DAT != string::npos ) || ( loc_dat != string::npos ) )
+ std::string::size_type loc_DAT = input_file.find( "DAT_01", 0 );
+ std::string::size_type loc_dat = input_file.find( "dat_01", 0 );
+ if ( (loc_DAT != std::string::npos ) || ( loc_dat != std::string::npos ) )
{
dataFilePath = input_file.c_str();
- if (loc_DAT != string::npos ) input_file.replace(loc_DAT, 6, "VDF_DAT");
- if (loc_dat != string::npos ) input_file.replace(loc_dat, 6, "vdf_dat");
+ if (loc_DAT != std::string::npos ) input_file.replace(loc_DAT, 6, "VDF_DAT");
+ if (loc_dat != std::string::npos ) input_file.replace(loc_dat, 6, "vdf_dat");
volumeDirectoryFilePath = input_file.c_str();
}
else
{
- string::size_type loc_VDF = input_file.find( "VDF_DAT", 0 );
- string::size_type loc_vdf = input_file.find( "vdf_dat", 0 );
- if ( (loc_VDF != string::npos ) || ( loc_vdf != string::npos ) )
+ std::string::size_type loc_VDF = input_file.find( "VDF_DAT", 0 );
+ std::string::size_type loc_vdf = input_file.find( "vdf_dat", 0 );
+ if ( (loc_VDF != std::string::npos ) || ( loc_vdf != std::string::npos ) )
{
volumeDirectoryFilePath = input_file.c_str();
- if (loc_VDF != string::npos ) input_file.replace(loc_VDF, 7, "DAT_01");
- if (loc_vdf != string::npos ) input_file.replace(loc_vdf, 7, "dat_01");
+ if (loc_VDF != std::string::npos ) input_file.replace(loc_VDF, 7, "DAT_01");
+ if (loc_vdf != std::string::npos ) input_file.replace(loc_vdf, 7, "dat_01");
dataFilePath = input_file.c_str();
}
else
@@ -224,7 +224,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
RadarSatRecordHeader headerVDF;
VolumeDirFactory factoryVDF;
- ifstream volumeDirFile (volumeDirectoryFilePath.c_str(), ios::in|ios::binary);
+ std::ifstream volumeDirFile (volumeDirectoryFilePath.c_str(), std::ios::in|std::ios::binary);
volumeDirFile>>headerVDF;
if(volumeDirFile.eof())
{
@@ -269,7 +269,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
//Reading of the remaining of the volume directory file
volumeDirFile.close();
- volumeDirFile.open(volumeDirectoryFilePath.c_str(), ios::in | ios::binary);
+ volumeDirFile.open(volumeDirectoryFilePath.c_str(), std::ios::in | std::ios::binary);
volumeDirFile >> *_volumeDir;
volumeDirFile.close();
@@ -280,7 +280,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
RadarSatRecordHeader headerDAT;
DataFactory factoryDAT;
- ifstream dataFile (dataFilePath.c_str(), ios::in|ios::binary);
+ std::ifstream dataFile (dataFilePath.c_str(), std::ios::in|std::ios::binary);
dataFile>>headerDAT;
if(dataFile.eof())
{
@@ -302,7 +302,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
/*
* Reading the remaining of the data file
*/
- dataFile.open(dataFilePath.c_str(), ios::in|ios::binary);
+ dataFile.open(dataFilePath.c_str(), std::ios::in|std::ios::binary);
dataFile>>*_data;
dataFile.close();
@@ -329,12 +329,12 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
* Warning : the filename case has to be homogenous
*/
std::string leader_file = dataFilePath;
- string::size_type loc = leader_file.find( "DAT_01", 0 );
- if( loc != string::npos ) leader_file.replace(loc, 6, "LEA_01" ); // upper case test
+ std::string::size_type loc = leader_file.find( "DAT_01", 0 );
+ if( loc != std::string::npos ) leader_file.replace(loc, 6, "LEA_01" ); // upper case test
else
{
loc = leader_file.find( "dat_01", 0 );
- if( loc != string::npos ) leader_file.replace(loc, 6, "lea_01" ); // lower case test
+ if( loc != std::string::npos ) leader_file.replace(loc, 6, "lea_01" ); // lower case test
else
{
ossimNotify(ossimNotifyLevel_DEBUG) << "File Name not coherent (searching for *DAT_01* or *dat_01*) : " << file << std::endl;
@@ -355,7 +355,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
/*
* Leader file data reading
*/
- ifstream leaderFile (leaderFilePath.c_str(), ios::in|ios::binary);
+ std::ifstream leaderFile (leaderFilePath.c_str(), std::ios::in|std::ios::binary);
leaderFile>>*_leader;
leaderFile.close();
if(traceDebug())
@@ -370,11 +370,11 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
*/
std::string trailer_file = dataFilePath;
loc = trailer_file.find( "DAT_01", 0 );
- if( loc != string::npos ) trailer_file.replace(loc, 6, "TRA_01" ); // upper case test
+ if( loc != std::string::npos ) trailer_file.replace(loc, 6, "TRA_01" ); // upper case test
else
{
loc = trailer_file.find( "dat_01", 0 );
- if( loc != string::npos ) trailer_file.replace(loc, 6, "tra_01" ); // lower case test
+ if( loc != std::string::npos ) trailer_file.replace(loc, 6, "tra_01" ); // lower case test
else
{
ossimNotify(ossimNotifyLevel_DEBUG) << "File Name not coherent (searching for *DAT_01* or *dat_01*) : " << file << std::endl;
@@ -395,7 +395,7 @@ bool ossimRadarSatModel::open(const ossimFilename& file)
/*
* Trailer file data reading
*/
- ifstream trailerFile (trailerFilePath.c_str(), ios::in|ios::binary);
+ std::ifstream trailerFile (trailerFilePath.c_str(), std::ios::in|std::ios::binary);
trailerFile>>*_trailer;
trailerFile.close();
if(traceDebug())
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
index 3832701fe3..caad19359c 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
@@ -116,14 +116,14 @@ namespace ossimplugins
// Capture stream flags since we are going to mess with them.
std::ios_base::fmtflags f = out.flags();
- out << "\nDump of ossimSentinel1Model at address " << hex << this
- << dec
+ out << "\nDump of ossimSentinel1Model at address " << std::hex << this
+ << std::dec
<< "\n------------------------------------------------"
<< "\n theImageID = " << theImageID
<< "\n theImageSize = " << theImageSize
<< "\n------------------------------------------------"
- << "\n " << endl;
+ << "\n " << std::endl;
// Set the flags back.
out.flags(f);
@@ -377,7 +377,7 @@ namespace ossimplugins
const ossimString prefix = "support_data.";
const ossimString xpath = "/xfdu:XFDU/dataObjectSection/dataObject";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
theManifestDoc->findNodes(xpath, xml_nodes);
@@ -1264,9 +1264,9 @@ namespace ossimplugins
double ossimSentinel1Model::getBandTerrainHeight(ossimXmlDocument const& productXmlDocument)
{
double heightSum = 0.0;
- vector< ossimXmlNodePtr > heightList;
+ std::vector< ossimXmlNodePtr > heightList;
productXmlDocument.findNodes("/product/generalAnnotation/terrainHeightList/terrainHeight", heightList);
- vector<ossimXmlNodePtr >::const_iterator it = heightList.begin();
+ std::vector<ossimXmlNodePtr >::const_iterator it = heightList.begin();
for ( ; it != heightList.end() ; ++it)
{
heightSum += getOptionalTextFromFirstNode(**it, "value").toFloat64();
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
index 185f29d37c..e8b4448184 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.cpp
@@ -99,7 +99,7 @@ namespace ossimplugins
ossimString xpath,
ossimString& nodeValue)
{
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
xmlDocument->findNodes(xpath, xml_nodes);
if (xml_nodes.size() == 0)
@@ -269,7 +269,7 @@ namespace ossimplugins
theSpecId = "";
}
- void ossimSpot6DimapSupportData::printInfo(ostream& os) const
+ void ossimSpot6DimapSupportData::printInfo(std::ostream& os) const
{
os << "\n----------------- Info on Spot6 Image -------------------"
@@ -1110,7 +1110,7 @@ namespace ossimplugins
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the Image ID:
@@ -1139,7 +1139,7 @@ namespace ossimplugins
ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Corner points:
@@ -1401,7 +1401,7 @@ namespace ossimplugins
{
static const char MODULE[] = "ossimSpot6DimapSupportData::parseRPCMetadata";
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the Global RFM - Direct Model - Bias:
@@ -1612,7 +1612,7 @@ namespace ossimplugins
{
static const char MODULE[] = "ossimSpot6DimapSupportData::parseMetadataIdentification";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
theXmlDocumentRoot = "/DIMAP_Document";
@@ -1632,7 +1632,7 @@ namespace ossimplugins
theXmlDocumentRoot = "/SPOT_DIMAP_Document";
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the old root: " << theXmlDocumentRoot << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the old root: " << theXmlDocumentRoot << std::endl;
}
xml_nodes.clear();
@@ -1647,7 +1647,7 @@ namespace ossimplugins
theXmlDocumentRoot = "/Dimap_Document";
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the new root: " << theXmlDocumentRoot << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nTry to use the new root: " << theXmlDocumentRoot << std::endl;
}
xml_nodes.clear();
@@ -1659,7 +1659,7 @@ namespace ossimplugins
setErrorStatus();
if (traceDebug())
{
- ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nCould not find: " << xpath << endl;
+ ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG:\nCould not find: " << xpath << std::endl;
}
return false;
}
@@ -1758,7 +1758,7 @@ namespace ossimplugins
{
static const char MODULE[] = "ossimSpot6DimapSupportData::parseProcessingInformation";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
//---
@@ -1787,7 +1787,7 @@ namespace ossimplugins
bool ossimSpot6DimapSupportData::parseRasterData(ossimRefPtr<ossimXmlDocument> xmlDocument)
{
static const char MODULE[] = "ossimSpot6DimapSupportData::parseRasterData";
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
ossimString xpath, nodeValue;
//---
// Fetch if the product file is linked to one or many JP2 files:
@@ -2005,7 +2005,7 @@ namespace ossimplugins
bool ossimSpot6DimapSupportData::parseGeometricData(ossimRefPtr<ossimXmlDocument> xmlDocument)
{
ossimString xpath;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
xml_nodes.clear();
xpath = "/Geometric_Data/Use_Area/Located_Geometric_Values"; //DIMAPv2
@@ -2125,7 +2125,7 @@ namespace ossimplugins
{
static const char MODULE[] = "ossimSpot6DimapSupportData::parseDatasetSources";
ossimString xpath, nodeValue;
- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
//---
// Fetch the mission index (1A or 1B) ?
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.h
index 1431d0d205..f0860ce8e0 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.h
@@ -81,7 +81,7 @@ namespace ossimplugins
//---
// Convenient method to print important image info:
//---
- void printInfo (ostream& os) const;
+ void printInfo (std::ostream& os) const;
/**
* Method to save the state of the object to a keyword list.
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6Model.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6Model.cpp
index ba5725b4ee..76caf5a0c9 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6Model.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6Model.cpp
@@ -107,8 +107,8 @@ namespace ossimplugins
// Capture stream flags since we are going to mess with them.
std::ios_base::fmtflags f = out.flags();
- out << "\nDump of ossimSpot6Model at address " << (hex) << this
- << (dec)
+ out << "\nDump of ossimSpot6Model at address " << (std::hex) << this
+ << (std::dec)
<< "\n------------------------------------------------"
<< "\n theImageID = " << theImageID
<< "\n theImageSize = " << theImageSize
@@ -116,7 +116,7 @@ namespace ossimplugins
<< "\n theRefImgPt = " << theRefImgPt
<< "\n theProcessingLevel = " << theSupportData->getProcessingLevel()
<< "\n------------------------------------------------"
- << "\n " << endl;
+ << "\n " << std::endl;
// Set the flags back.
out.flags(f);
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp
index 8589668302..215572c815 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp
@@ -856,7 +856,7 @@ std::ostream& ossimplugins::ossimTerraSarModel::print(std::ostream& out) const
// Capture the original flags.
std::ios_base::fmtflags f = out.flags();
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\nossimTerraSarModelclass data members:\n"
<< SR_GR_R0_KW << _SrToGr_R0 << "\n";
@@ -1546,7 +1546,7 @@ bool ossimplugins::ossimTerraSarModel::initSensorParams(const ossimXmlDocument*
if (traceDebug())
{
ossimNotify(ossimNotifyLevel_DEBUG)
- << "result for tsDoc.initSensorParams " << result << endl;
+ << "result for tsDoc.initSensorParams " << result << std::endl;
}
if (!result)
@@ -2436,7 +2436,7 @@ bool ossimplugins::ossimTerraSarModel::findTSXLeader(const ossimFilename& file,
}
-void ossimplugins::ossimTerraSarModel::printInfo(ostream& os) const
+void ossimplugins::ossimTerraSarModel::printInfo(std::ostream& os) const
{
os << "\n----------------- General Info on TSX-1 Image -------------------"
<< "\n "
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h
index de847a3868..46715aa3cb 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h
@@ -118,7 +118,7 @@ namespace ossimplugins
//---
// Convenient method to print important image info:
//---
- void printInfo (ostream& os) const;
+ void printInfo (std::ostream& os) const;
private:
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.cpp
index 6d887e7f90..f568252889 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.cpp
@@ -184,7 +184,7 @@ namespace ossimplugins
std::ostream& ossimTileMapModel::print(std::ostream& os) const
{
os << "\nDump of ossimTileMapModel object at "
- << hex << this << ":\n"
+ << std::hex << this << ":\n"
<< "\nTileMapModel -- Dump of all data members: "
<< "\n theImageID: " << theImageID.chars()
<< "\n theImageSize: " << theImageSize
@@ -193,7 +193,7 @@ namespace ossimplugins
<< "\n theGSD.line: " << theGSD.line
<< "\n theGSD.samp: " << theGSD.samp
<< "\n qDepth: " << qDepth
- << endl;
+ << std::endl;
return ossimSensorModel::print(os);
}
@@ -282,7 +282,7 @@ namespace ossimplugins
// Writes a sample kwl to output stream.
//
//*****************************************************************************
- void ossimTileMapModel::writeGeomTemplate(ostream& os)
+ void ossimTileMapModel::writeGeomTemplate(std::ostream& os)
{
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimTileMapModel::writeGeomTemplate: entering..." << std::endl;
@@ -290,7 +290,7 @@ namespace ossimplugins
"//**************************************************************\n"
"// Template for TileMap model keywordlist\n"
"//**************************************************************\n"
- << ossimKeywordNames::TYPE_KW << ": " << "ossimTileMapModel" << endl;
+ << ossimKeywordNames::TYPE_KW << ": " << "ossimTileMapModel" << std::endl;
if (traceExec()) ossimNotify(ossimNotifyLevel_DEBUG) << "DEBUG ossimTileMapModel::writeGeomTemplate: returning..." << std::endl;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h
index 33d9f30748..8d98e2e987 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h
@@ -95,7 +95,7 @@ public:
* Writes a template of geom keywords processed by loadState and saveState
* to output stream.
*/
- static void writeGeomTemplate(ostream& os);
+ static void writeGeomTemplate(std::ostream& os);
//***
// Overrides base class pure virtual.
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/IncidenceAngles.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/IncidenceAngles.cpp
index 8dc860f17f..d030d025fe 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/IncidenceAngles.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/IncidenceAngles.cpp
@@ -148,7 +148,7 @@ bool IncidenceAngles::loadState(const ossimKeywordlist& kwl, const char* prefix)
std::ostream& IncidenceAngles::print(std::ostream& out) const
{
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\n IncidentAngles class data members:\n";
const char* prefix = 0;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/Noise.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/Noise.cpp
index dfa8168b25..7b9ca1c527 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/Noise.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/Noise.cpp
@@ -149,7 +149,7 @@ bool Noise::loadState(const ossimKeywordlist& kwl, const char* prefix)
std::ostream& Noise::print(std::ostream& out) const
{
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\n Noise class data members:\n";
const char* prefix = 0;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/RadarSat2NoiseLevel.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/RadarSat2NoiseLevel.cpp
index 2742fcdd78..f2f64cb48d 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/RadarSat2NoiseLevel.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/RadarSat2NoiseLevel.cpp
@@ -313,7 +313,7 @@ bool RadarSat2NoiseLevel::loadState(const ossimKeywordlist& kwl, const char* pre
std::ostream& RadarSat2NoiseLevel::print(std::ostream& out) const
{
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\n RadarSat2NoiseLevel class data members:\n";
//const char* prefix = 0;
diff --git a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/SceneCoord.cpp b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/SceneCoord.cpp
index 8eacd1c958..1bbc15c7d6 100644
--- a/Modules/ThirdParty/OssimPlugins/src/ossim/otb/SceneCoord.cpp
+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/otb/SceneCoord.cpp
@@ -152,7 +152,7 @@ bool SceneCoord::loadState(const ossimKeywordlist& kwl, const char* prefix)
std::ostream& SceneCoord::print(std::ostream& out) const
{
- out << setprecision(15) << setiosflags(ios::fixed)
+ out << std::setprecision(15) << std::setiosflags(std::ios::fixed)
<< "\n SceneCoord class data members:\n";
const char* prefix = 0;
--
GitLab