From 51c7cacd3431dc79d950c6d53c563378bc6f07cc Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Sun, 26 Jun 2011 12:41:17 -0700
Subject: [PATCH] ENH: update interfaces for new ossim version
---
.../OssimAdapters/otbImageKeywordlist.cxx | 11 +++--------
.../OssimAdapters/otbMapProjectionAdapter.cxx | 2 +-
.../ossim/ossimPluginReaderFactory.cpp | 2 +-
.../otbossimplugins/ossim/ossimPluginReaderFactory.h | 3 ++-
Utilities/otbossimplugins/ossim/otb/Noise.cpp | 4 ++--
.../otbossimplugins/ossim/otb/PlatformPosition.cpp | 4 ++--
.../otbossimplugins/ossim/otb/RadarSat2NoiseLevel.cpp | 2 +-
7 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx
index 6c2e44f886..0041a65d41 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx
@@ -27,9 +27,6 @@
#include "imaging/ossimImageHandlerRegistry.h"
#include "ossimTileMapModel.h"
-// FIXME Temporarily deactivated
-// #include "otbTileMapImageIO.h"
-
namespace otb
{
@@ -64,8 +61,8 @@ SetKeywordlist(const ossimKeywordlist& kwl)
it != kwl.getMap().end();
++it)
{
- std::string first(it->first.stringDup());
- std::string second(it->second.stringDup());
+ std::string first(it->first);
+ std::string second(it->second);
m_Keywordlist[first] = second;
}
}
@@ -118,9 +115,7 @@ convertToOSSIMKeywordlist(ossimKeywordlist& kwl) const
it != m_Keywordlist.end();
++it)
{
- ossimString first(it->first);
- ossimString second(it->second);
- ossimMap[first] = second;
+ ossimMap[it->first] = it->second;
}
kwl.getMap() = ossimMap;
}
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx b/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx
index a13761dc0f..0853acf083 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx
@@ -93,7 +93,7 @@ std::string MapProjectionAdapter::GetWkt() const
m_MapProjection->saveState(kwl);
ossimOgcWktTranslator wktTranslator;
std::string wkt;
- wkt = wktTranslator.fromOssimKwl(kwl);
+ wkt = wktTranslator.fromOssimKwl(kwl).chars();
return wkt;
}
diff --git a/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.cpp b/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.cpp
index e3470327c1..3d21e51f03 100644
--- a/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.cpp
@@ -48,7 +48,7 @@ ossimPluginReaderFactory* ossimPluginReaderFactory::instance()
}
ossimImageHandler* ossimPluginReaderFactory::open(
- const ossimFilename& fileName)const
+ const ossimFilename& fileName, bool openOverview)const
{
if(traceDebug())
{
diff --git a/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.h b/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.h
index 1699aeec59..a8fda870f6 100644
--- a/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.h
+++ b/Utilities/otbossimplugins/ossim/ossimPluginReaderFactory.h
@@ -41,7 +41,8 @@ public:
* @param file The file to open.
* @return pointer to image handler on success, 0 on failure.
*/
- virtual ossimImageHandler* open(const ossimFilename& fileName) const;
+ virtual ossimImageHandler* open(const ossimFilename& fileName,
+ bool openOverview=true) const;
/**
* @brief open that takes a keyword list and prefix.
diff --git a/Utilities/otbossimplugins/ossim/otb/Noise.cpp b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
index 544f71566d..08c0d1c8cd 100644
--- a/Utilities/otbossimplugins/ossim/otb/Noise.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
@@ -142,10 +142,10 @@ std::ostream& Noise::print(std::ostream& out) const
ossimKeywordlist kwl;
ossimString pfx;
pfx += NOISE;
- std::string s = pfx + "." + NUMBER_OF_NOISE_RECORDS_KW;
+ ossimString s = pfx + "." + NUMBER_OF_NOISE_RECORDS_KW;
kwl.add(prefix, s.c_str(), _numberOfNoiseRecords);
s = pfx + "." + NAME_OF_NOISE_POLARISATION_KW;
- kwl.add(prefix, s.c_str(), _polarisation);
+ kwl.add(prefix, s.chars(), _polarisation);
for (unsigned int i = 0; i < _tabImageNoise.size(); ++i)
{
std::string s2 = pfx + "[" + ossimString::toString(i) + "]";
diff --git a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
index b614718d57..2cb0a5610d 100644
--- a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
@@ -188,7 +188,7 @@ bool PlatformPosition::saveState(ossimKeywordlist& kwl,
{
std::string s2 = s1;
s2 += "platform_position[";
- s2 += ossimString::toString(i);
+ s2 += ossimString::toString(i).chars();
s2+= "]";
_data[i]->saveState(kwl, s2.c_str());
}
@@ -224,7 +224,7 @@ bool PlatformPosition::loadState(const ossimKeywordlist& kwl,
{
std::string s2 = s1;
s2 += "platform_position[";
- s2 += ossimString::toString(i);
+ s2 += ossimString::toString(i).chars();
s2+= "]";
_data[i] = new Ephemeris();
diff --git a/Utilities/otbossimplugins/ossim/otb/RadarSat2NoiseLevel.cpp b/Utilities/otbossimplugins/ossim/otb/RadarSat2NoiseLevel.cpp
index 9e157dc8dd..e87aec49b3 100644
--- a/Utilities/otbossimplugins/ossim/otb/RadarSat2NoiseLevel.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/RadarSat2NoiseLevel.cpp
@@ -117,7 +117,7 @@ bool RadarSat2NoiseLevel::saveState(ossimKeywordlist& kwl, const char* prefix) c
for (unsigned int i = 0; i < _noiseLevelValues.size(); ++i)
{
- s = pfx + NOISE_LEVEL_VALUES_KW + "[" + ossimString::toString(i) + "]";
+ s = pfx + NOISE_LEVEL_VALUES_KW + "[" + ossimString::toString(i).chars() + "]";
kwl.add(prefix, s.c_str(), _noiseLevelValues[i]);
}
--
GitLab