From 88bb3c846dfcf68f7eff6958d20647945f18bd8c Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Thu, 13 Aug 2009 14:40:02 +0800
Subject: [PATCH] OSSIM: ERS handled by ossim plugins
---
.../imaging/ossimImageHandlerFactory.cpp | 56 ++++++++---------
.../imaging/ossimImageHandlerSarFactory.cpp | 60 +++++++++----------
.../projection/ossimSensorModelFactory.cpp | 12 ++--
3 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
index e736b31c70..9caf4a8d01 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
@@ -18,7 +18,7 @@
#include <ossim/imaging/ossimUsgsDemTileSource.h>
#include <ossim/imaging/ossimLandsatTileSource.h>
#include <ossim/imaging/ossimGeneralRasterTileSource.h>
-#include <ossim/imaging/ossimERSTileSource.h>
+// #include <ossim/imaging/ossimERSTileSource.h>
#include <ossim/imaging/ossimVpfTileSource.h>
#include <ossim/imaging/ossimTileMapTileSource.h>
#include <ossim/base/ossimTrace.h>
@@ -281,17 +281,17 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimFilename& fileName)
}
delete result;
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying ERS" << std::endl;
- }
- result = new ossimERSTileSource;
- if(result->open(copyFilename))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying ERS" << std::endl;
+// }
+// result = new ossimERSTileSource;
+// if(result->open(copyFilename))
+// {
+// return result;
+// }
+// delete result;
// Note: SRTM should be in front of general raster...
if(traceDebug())
@@ -592,17 +592,17 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
}
delete result;
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying ERS" << std::endl;
- }
- result = new ossimERSTileSource;
- if(result->loadState(kwl, prefix))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying ERS" << std::endl;
+// }
+// result = new ossimERSTileSource;
+// if(result->loadState(kwl, prefix))
+// {
+// return result;
+// }
+// delete result;
// Note: SRTM should be in front of general raster...
if(traceDebug())
{
@@ -681,10 +681,10 @@ ossimObject* ossimImageHandlerFactory::createObject(const ossimString& typeName)
{
return new ossimLandsatTileSource();
}
- if(STATIC_TYPE_NAME(ossimERSTileSource) == typeName)
- {
- return new ossimERSTileSource();
- }
+// if(STATIC_TYPE_NAME(ossimERSTileSource) == typeName)
+// {
+// return new ossimERSTileSource();
+// }
if(STATIC_TYPE_NAME(ossimSrtmTileSource) == typeName)
{
return new ossimSrtmTileSource();
@@ -784,7 +784,7 @@ void ossimImageHandlerFactory::getTypeNameList(std::vector<ossimString>& typeLis
typeList.push_back(STATIC_TYPE_NAME(ossimTiffTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimUsgsDemTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimLandsatTileSource));
- typeList.push_back(STATIC_TYPE_NAME(ossimERSTileSource));
+// typeList.push_back(STATIC_TYPE_NAME(ossimERSTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimSrtmTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimGeneralRasterTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimTileMapTileSource));
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
index 450d5f0324..154f9851b7 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerSarFactory.cpp
@@ -14,7 +14,7 @@
#include <ossim/imaging/ossimTerraSarTileSource.h>
//#include <ossim/imaging/ossimCosmoSkymedTileSource.h>
#include <ossim/imaging/ossimEnvisatAsarTileSource.h>
-#include <ossim/imaging/ossimErsSarTileSource.h>
+// #include <ossim/imaging/ossimErsSarTileSource.h>
@@ -117,18 +117,18 @@ ossimImageHandler* ossimImageHandlerSarFactory::open(const ossimFilename& fileNa
// delete result;
// ERS
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying Ers Sar"
- << std::endl;
- }
- result = new ossimErsSarTileSource;
- if(result->open(copyFilename))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying Ers Sar"
+// << std::endl;
+// }
+// result = new ossimErsSarTileSource;
+// if(result->open(copyFilename))
+// {
+// return result;
+// }
+// delete result;
//// Cosmo Skymed
//if(traceDebug())
@@ -215,18 +215,18 @@ ossimImageHandler* ossimImageHandlerSarFactory::open(const ossimKeywordlist& kwl
}
delete result;
- if(traceDebug())
- {
- ossimNotify(ossimNotifyLevel_DEBUG)
- << "trying Ers Sar"
- << std::endl;
- }
- result = new ossimErsSarTileSource();
- if(result->loadState(kwl, prefix))
- {
- return result;
- }
- delete result;
+// if(traceDebug())
+// {
+// ossimNotify(ossimNotifyLevel_DEBUG)
+// << "trying Ers Sar"
+// << std::endl;
+// }
+// result = new ossimErsSarTileSource();
+// if(result->loadState(kwl, prefix))
+// {
+// return result;
+// }
+// delete result;
/*if(traceDebug())
{
@@ -268,10 +268,10 @@ ossimObject* ossimImageHandlerSarFactory::createObject(const ossimString& typeNa
{
return new ossimCosmoSkymedTileSource();
}*/
- if(STATIC_TYPE_NAME(ossimErsSarTileSource) == typeName)
- {
- return new ossimErsSarTileSource();
- }
+// if(STATIC_TYPE_NAME(ossimErsSarTileSource) == typeName)
+// {
+// return new ossimErsSarTileSource();
+// }
// if(STATIC_TYPE_NAME(ossimRadarSat2TileSource) == typeName)
// {
// return new ossimRadarSat2TileSource();
@@ -338,6 +338,6 @@ void ossimImageHandlerSarFactory::getTypeNameList(std::vector<ossimString>& type
typeList.push_back(STATIC_TYPE_NAME(ossimTerraSarTileSource));
typeList.push_back(STATIC_TYPE_NAME(ossimEnvisatAsarTileSource));
//typeList.push_back(STATIC_TYPE_NAME(ossimCosmoSkymedTileSource));
- typeList.push_back(STATIC_TYPE_NAME(ossimErsSarTileSource));
+// typeList.push_back(STATIC_TYPE_NAME(ossimErsSarTileSource));
// typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2TileSource));
}
diff --git a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
index d333704d2f..28423b6324 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
@@ -51,7 +51,7 @@ static ossimTrace traceDebug = ossimTrace("ossimSensorModelFactory:debug");
#include <ossim/projection/ossimTerraSarModel.h>
//#include <ossim/projection/ossimCosmoSkymedModel.h>
// #include <ossim/projection/ossimRadarSat2Model.h>
-#include <ossim/projection/ossimErsSarModel.h>
+// #include <ossim/projection/ossimErsSarModel.h>
#include <ossim/projection/ossimTileMapModel.h>
//***
@@ -212,10 +212,10 @@ ossimSensorModelFactory::createProjection(const ossimString &name) const
// {
// return new ossimRadarSat2Model;
// }
- if (name == STATIC_TYPE_NAME(ossimErsSarModel))
- {
- return new ossimErsSarModel;
- }
+// if (name == STATIC_TYPE_NAME(ossimErsSarModel))
+// {
+// return new ossimErsSarModel;
+// }
//***
// ADD_MODEL: (Please leave this comment for the next programmer)
//***
@@ -268,7 +268,7 @@ ossimSensorModelFactory::getTypeNameList(std::vector<ossimString>& typeList)
typeList.push_back(STATIC_TYPE_NAME(ossimTerraSarModel));
// typeList.push_back(STATIC_TYPE_NAME(ossimCosmoSkymedModel));
typeList.push_back(STATIC_TYPE_NAME(ossimEnvisatAsarModel));
- typeList.push_back(STATIC_TYPE_NAME(ossimErsSarModel));
+// typeList.push_back(STATIC_TYPE_NAME(ossimErsSarModel));
typeList.push_back(STATIC_TYPE_NAME(ossimTileMapModel));
//***
// ADD_MODEL: Please leave this comment for the next programmer. Add above.
--
GitLab