[Git][debian-gis-team/otb][master] 4 commits: Add patch to fix FTBFS with OSSIM 2.9.1.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Sep 10 21:42:05 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / otb
Commits:
0e75d6a1 by Bas Couwenberg at 2019-09-10T18:55:07Z
Add patch to fix FTBFS with OSSIM 2.9.1.
- - - - -
ef9fb978 by Bas Couwenberg at 2019-09-10T18:55:07Z
Add patch to support GDAL 3.
- - - - -
ef932316 by Bas Couwenberg at 2019-09-10T19:37:58Z
Set distribution to unstable.
- - - - -
6393d308 by Bas Couwenberg at 2019-09-10T20:41:37Z
Use ${python3:Depends} substvar for python3-otb.
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/gdal.patch
- + debian/patches/ossim.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+otb (6.6.1+dfsg-4) UNRELEASED; urgency=medium
+
+ * Use ${python3:Depends} substvar for python3-otb.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 10 Sep 2019 22:40:51 +0200
+
+otb (6.6.1+dfsg-3) unstable; urgency=medium
+
+ * Add patch to fix FTBFS with OSSIM 2.9.1.
+ * Add patch to support GDAL 3.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 10 Sep 2019 21:37:47 +0200
+
otb (6.6.1+dfsg-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -960,10 +960,10 @@ Package: python3-otb
Architecture: any
Section: python
Depends: libotb-apps (= ${binary:Version}),
+ dh-python,
+ ${python3:Depends},
${shlibs:Depends},
${misc:Depends},
- python3,
- dh-python
Description: ORFEO Toolbox Python API for applications (Python 3)
ORFEO Toolbox (OTB) is distributed as an open source library of image
processing algorithms. OTB is based on the medical image processing library
=====================================
debian/patches/gdal.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Add support for GDAL 3.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/Modules/ThirdParty/GDAL/otb-module-init.cmake
++++ b/Modules/ThirdParty/GDAL/otb-module-init.cmake
+@@ -95,7 +95,7 @@ if(EXISTS "${TEMP}/gdalVersion.txt")
+ file(READ "${TEMP}/gdalVersion.txt" _GDAL_VERSION_STRING)
+ #can't we use GDAL_VERSION_NUM ?
+ string(SUBSTRING ${_GDAL_VERSION_STRING} 0 2 VER2)
+- if("${VER2}" STREQUAL "2.")
++ if("${VER2}" STREQUAL "2." OR "${VER2}" STREQUAL "3.")
+ set(OTB_USE_GDAL_20 true CACHE INTERNAL "True if GDAL >= 2.0.0 has been detected" FORCE )
+ else()
+ set(OTB_USE_GDAL_20 false CACHE INTERNAL "True if GDAL >= 2.0.0 has been detected" FORCE )
=====================================
debian/patches/ossim.patch
=====================================
@@ -0,0 +1,1182 @@
+Description: Fix FTBFS with OSSIM 2.9.1.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/gdal/ossimOgcWktTranslator.cpp
+@@ -128,7 +128,7 @@ ossimString ossimOgcWktTranslator::fromO
+ << ": "
+ << ( ossimUnitTypeLut::instance()->
+ getEntryString(units).c_str() )
+- << endl;
++ << std::endl;
+ break;
+ }
+ } // End of switch (units)
+@@ -491,11 +491,11 @@ ossimString ossimOgcWktTranslator::fromO
+ }
+ else
+ {
+- cerr << "ossimOgcWktTranslator::fromOssimKwl:\n"
+- << "Projection translation for "
+- << projType
+- << " not supported "
+- << endl;
++ std::cerr << "ossimOgcWktTranslator::fromOssimKwl:\n"
++ << "Projection translation for "
++ << projType
++ << " not supported "
++ << std::endl;
+ }
+
+ if(pcsCodeVal >= EPSG_CODE_MAX)
+@@ -532,10 +532,10 @@ ossimString ossimOgcWktTranslator::fromO
+ }
+ else
+ {
+- cerr << "ossimOgcWktTranslator::fromOssimKwl: Datum translation for "
+- << datumType
+- <<" not supported"
+- << endl;
++ std::cerr << "ossimOgcWktTranslator::fromOssimKwl: Datum translation for "
++ << datumType
++ <<" not supported"
++ << std::endl;
+ }
+ }
+
+@@ -700,7 +700,7 @@ bool ossimOgcWktTranslator::toOssimKwl(
+ {
+ 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(
+ << "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::wktTo
+ 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::ossim
+ 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::wktTo
+ 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())
+ {
+--- 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);
+--- 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";
+--- 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
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSatModel.cpp
+@@ -158,24 +158,24 @@ bool ossimRadarSatModel::open(const ossi
+ 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 ossi
+
+ 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 ossi
+ //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 ossi
+
+ 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 ossi
+ /*
+ * 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 ossi
+ * 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 ossi
+ /*
+ * 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 ossi
+ */
+ 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 ossi
+ /*
+ * 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())
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.h
+@@ -163,7 +163,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;
+--- 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);
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatDimapSupportData.cpp
+@@ -325,7 +325,7 @@ bool ossimFormosatDimapSupportData::load
+ //---
+ // 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);
+@@ -802,7 +802,7 @@ void ossimFormosatDimapSupportData::getG
+ }
+ }
+
+-void ossimFormosatDimapSupportData::printInfo(ostream& os) const
++void ossimFormosatDimapSupportData::printInfo(std::ostream& os) const
+ {
+ ossimString corr_att = "NO";
+ if (theStarTrackerUsed)
+@@ -1521,7 +1521,7 @@ bool ossimFormosatDimapSupportData::pars
+ static const char MODULE[] = "ossimFormosatDimapSupportData::parsePart1";
+
+ ossimString xpath;
+- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
++ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+
+ //---
+ // Fetch the ImageSize:
+@@ -2350,7 +2350,7 @@ bool ossimFormosatDimapSupportData::init
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG:\nCould not find: " << xpath
+- << endl;
++ << std::endl;
+ }
+ return false;
+ }
+@@ -2385,7 +2385,7 @@ bool ossimFormosatDimapSupportData::init
+ ossimRefPtr<ossimXmlDocument> xmlDocument)
+ {
+ ossimString xpath;
+- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
++ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+
+ //---
+ // Fetch the Image ID:
+@@ -2399,7 +2399,7 @@ bool ossimFormosatDimapSupportData::init
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG:\nCould not find: " << xpath
+- << endl;
++ << std::endl;
+ }
+ return false;
+ }
+@@ -2411,7 +2411,7 @@ bool ossimFormosatDimapSupportData::init
+ ossimRefPtr<ossimXmlDocument> xmlDocument)
+ {
+ ossimString xpath;
+- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
++ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+
+ //---
+ // Fetch the mission index (Formosat 1 or 2):
+@@ -2590,7 +2590,7 @@ bool ossimFormosatDimapSupportData::init
+ ossimRefPtr<ossimXmlDocument> xmlDocument)
+ {
+ ossimString xpath;
+- vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
++ std::vector<ossimRefPtr<ossimXmlNode> > xml_nodes;
+
+ //---
+ // Corner points:
+--- 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::creat
+
+ 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);
+
+--- 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) ?
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimPleiadesDimapSupportData.h
+@@ -83,7 +83,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.
+--- 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);
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.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);
+
+ /*!
+ * Given an image point and height, initializes worldPoint.
+--- 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) ?
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSpot6DimapSupportData.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.
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.cpp
+@@ -856,7 +856,7 @@ std::ostream& ossimplugins::ossimTerraSa
+ // 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::i
+ 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::f
+ }
+
+
+-void ossimplugins::ossimTerraSarModel::printInfo(ostream& os) const
++void ossimplugins::ossimTerraSarModel::printInfo(std::ostream& os) const
+ {
+ os << "\n----------------- General Info on TSX-1 Image -------------------"
+ << "\n "
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTerraSarModel.h
+@@ -119,7 +119,7 @@ namespace ossimplugins
+ //---
+ // Convenient method to print important image info:
+ //---
+- void printInfo (ostream& os) const;
++ void printInfo (std::ostream& os) const;
+
+ private:
+
+--- 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;
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimTileMapModel.h
+@@ -96,7 +96,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.
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimFormosatModel.cpp
+@@ -472,8 +472,8 @@ std::ostream& ossimplugins::ossimFormosa
+ // 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::ossimFormosa
+ << "\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::i
+ {
+ 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::i
+ {
+ 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::i
+ {
+ ossimNotify(ossimNotifyLevel_DEBUG)
+ << "DEBUG:\n\t orbToEcfRotation = " << orbToEcfRotation
+- << "\n\t u_ecf = " << u_ecf << endl;
++ << "\n\t u_ecf = " << u_ecf << std::endl;
+ }
+
+ //
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2Model.cpp
+@@ -115,7 +115,7 @@ double ossimRadarSat2Model::getSlantRang
+ << "\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 oss
+ 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
+ // 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";
+
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimRadarSat2ProductDoc.cpp
+@@ -711,10 +711,10 @@ RPCModel ossimRadarSat2ProductDoc::getRp
+ 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::getRp
+ 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::getRp
+
+
+ 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::getRp
+ // ------------------
+
+ 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::getRp
+ // ------------------
+
+ 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::getRp
+ // ------------------
+
+ 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];
+
+--- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
++++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
+@@ -115,14 +115,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);
+@@ -371,7 +371,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);
+
+@@ -1169,9 +1169,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();
+--- 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);
+--- 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 os
+
+ 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;
+--- 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 ossimKeyword
+
+ 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;
+--- 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(cons
+
+ 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;
+--- 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 ossimKe
+
+ 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;
+--- a/Modules/Adapters/OSSIMAdapters/src/otbMapProjectionAdapter.cxx
++++ b/Modules/Adapters/OSSIMAdapters/src/otbMapProjectionAdapter.cxx
+@@ -240,7 +240,7 @@ bool MapProjectionAdapter::InstantiatePr
+ //see discussion in May 2009 on ossim list;
+ //a better solution might be available...
+ std::string projectionString(kwl.find("type"));
+- if (projectionString.find("ossimEquDistCylProjection") != string::npos)
++ if (projectionString.find("ossimEquDistCylProjection") != std::string::npos)
+ {
+ otbMsgDevMacro(<< "WARNING: Not instantiating a ossimEquDistCylProjection: " << projectionString);
+ otbMsgDevMacro(<< "Wkt was: " << kwl);
+--- a/Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest4.cxx
++++ b/Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest4.cxx
+@@ -94,7 +94,7 @@ int otbOssimElevManagerTest4(int argc, c
+
+ std::ofstream file;
+ std::cout << outfname << std::endl;
+- file.open(outfname, ios::binary | ios::out);
++ file.open(outfname, std::ios::binary | std::ios::out);
+
+ file.write(reinterpret_cast<char*>(image), sizeof(double) * size[0] * size[1]);
+ file.close();
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
version-install.patch
0001-BUG-remove-.Fixup-for-GDAL-2.5-compatibility.patch
+ossim.patch
+gdal.patch
=====================================
debian/rules
=====================================
@@ -106,7 +106,7 @@ override_dh_installdocs:
dh_installdocs -A NOTICE
override_dh_python3:
- dh_python3
- dh_numpy3
+ dh_python3 -ppython3-otb
+ dh_numpy3 -ppython3-otb
.PHONY: templates
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/39a39fd22c7587d6219653f6f75e071a3513a225...6393d30889e10df37be062795c0933b742daf4b5
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/39a39fd22c7587d6219653f6f75e071a3513a225...6393d30889e10df37be062795c0933b742daf4b5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190910/eb9131cc/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list