From a8432eca9d11c23183aac4c8a74066b7696b98fa Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 19 Feb 2010 16:30:51 +0800
Subject: [PATCH] OSSIM: reducing distance between ossim and OTB
---
Utilities/FLTK/fluid/pixmaps/.cvsignore | 1 -
Utilities/ITK/Utilities/gdcm/.cvsignore | 37 --------
Utilities/ITK/Utilities/gdcm/Dicts/.cvsignore | 5 --
Utilities/ITK/Utilities/gdcm/src/.cvsignore | 18 ----
.../otbossim/include/ossim/base/ossimCommon.h | 9 +-
.../otbossim/include/ossim/base/ossimRtti.h | 1 -
.../src/ossim/base/ossimKeywordlist.cpp | 10 +--
Utilities/otbossim/src/ossim/font/.cvsignore | 1 -
.../otbossim/src/ossim/imaging/.cvsignore | 1 -
.../imaging/ossimImageHandlerFactory.cpp | 90 -------------------
.../projection/ossimSensorModelFactory.cpp | 36 --------
11 files changed, 6 insertions(+), 203 deletions(-)
delete mode 100644 Utilities/FLTK/fluid/pixmaps/.cvsignore
delete mode 100644 Utilities/ITK/Utilities/gdcm/.cvsignore
delete mode 100644 Utilities/ITK/Utilities/gdcm/Dicts/.cvsignore
delete mode 100644 Utilities/ITK/Utilities/gdcm/src/.cvsignore
delete mode 100644 Utilities/otbossim/src/ossim/font/.cvsignore
delete mode 100644 Utilities/otbossim/src/ossim/imaging/.cvsignore
diff --git a/Utilities/FLTK/fluid/pixmaps/.cvsignore b/Utilities/FLTK/fluid/pixmaps/.cvsignore
deleted file mode 100644
index 3df5b20556..0000000000
--- a/Utilities/FLTK/fluid/pixmaps/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.bck
diff --git a/Utilities/ITK/Utilities/gdcm/.cvsignore b/Utilities/ITK/Utilities/gdcm/.cvsignore
deleted file mode 100644
index 55f3c305b3..0000000000
--- a/Utilities/ITK/Utilities/gdcm/.cvsignore
+++ /dev/null
@@ -1,37 +0,0 @@
-Makefile.in
-Makefile
-config.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-libtool
-ltmain.sh
-aclocal.m4
-autom4te.cache
-*.pyc
-build
-dist
-MANIFEST
-gdcm*.tar.gz
-gdcm.spec
-*Debug*
-*Release*
-*gdcmData*
-*.ncb
-*.opt
-*Python.cxx
-*lib*
-CMakeCCompiler.cmake
-CMakeCXXCompiler.cmake
-CMakeCache.txt
-CMakeOutput.log
-CMakeSystem.cmake
-CMakeTmp
-DartConfiguration.tcl
-DartTestfile.txt
-cmake.check_cache
-cmake.check_depends
-cmake.depends
-gdcmConfigure.h
diff --git a/Utilities/ITK/Utilities/gdcm/Dicts/.cvsignore b/Utilities/ITK/Utilities/gdcm/Dicts/.cvsignore
deleted file mode 100644
index ed951f5ccd..0000000000
--- a/Utilities/ITK/Utilities/gdcm/Dicts/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-DartTestfile.txt
-cmake.check_depends
-cmake.depends
diff --git a/Utilities/ITK/Utilities/gdcm/src/.cvsignore b/Utilities/ITK/Utilities/gdcm/src/.cvsignore
deleted file mode 100644
index 30a9615f03..0000000000
--- a/Utilities/ITK/Utilities/gdcm/src/.cvsignore
+++ /dev/null
@@ -1,18 +0,0 @@
-*.o
-*.so
-.deps
-.libs
-Makefile.in
-Makefile
-*.lo
-*.la
-*Debug*
-*Release*
-config.h
-config.h.in
-stamp-h
-stamp-h1
-stamp-h.in
-DartTestfile.txt
-cmake.check_depends
-cmake.depends
diff --git a/Utilities/otbossim/include/ossim/base/ossimCommon.h b/Utilities/otbossim/include/ossim/base/ossimCommon.h
index 7512bf82b0..26706137de 100644
--- a/Utilities/otbossim/include/ossim/base/ossimCommon.h
+++ b/Utilities/otbossim/include/ossim/base/ossimCommon.h
@@ -66,13 +66,7 @@ namespace ossim
*
* @see nan()
*/
-// BEGIN OTB modifications : select "std::isnan" for CYGWIN platform
-#if defined(__CYGWIN__)
- inline bool isnan(const float& v) { return ( std::isnan(v) ); }
- inline bool isnan(const double& v) { return ( std::isnan(v) ); }
-//#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
-// END OTB modifications : std::isnan for CYGWIN
-#elif defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
+#if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__)
inline bool isnan(const float& v) { return _isnan(v); }
inline bool isnan(const double& v) { return _isnan(v); }
#elif defined(sun) || defined(__sun)
@@ -90,7 +84,6 @@ namespace ossim
inline bool isnan(const double& v) { return ( std::isnan(v) ); }
#endif
-
/* #if defined(WIN32) || defined(_MSC_VER) && !defined(__CYGWIN__) && !defined(__MWERKS__) */
/* inline bool isnan(const float& v) { return _isnan(v); } */
/* inline bool isnan(const double& v) { return _isnan(v); } */
diff --git a/Utilities/otbossim/include/ossim/base/ossimRtti.h b/Utilities/otbossim/include/ossim/base/ossimRtti.h
index 452b08cf6f..ea99c68367 100644
--- a/Utilities/otbossim/include/ossim/base/ossimRtti.h
+++ b/Utilities/otbossim/include/ossim/base/ossimRtti.h
@@ -126,7 +126,6 @@ class OSSIMDLLEXPORT RTTItypeid
RTTItypeid(const RTTITypeinfo* p): theId(p) {}
RTTItypeid();
-
int operator==(RTTItypeid) const;
int operator!=(RTTItypeid) const;
const RTTITypeinfo* get_info() const { return theId; }
diff --git a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
index 0e0afdc05b..4eca3c18c0 100644
--- a/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimKeywordlist.cpp
@@ -107,7 +107,7 @@ void ossimKeywordlist::add(const ossimKeywordlist& kwl,
// Check for null prefix.
ossimString tmpPrefix;
if (prefix) tmpPrefix = prefix;
-
+
regExp.compile(("^("+tmpPrefix+")").c_str());
while(iter != kwl.theMap.end())
@@ -869,7 +869,7 @@ bool ossimKeywordlist::parseStream(std::istream& is,
{
return false;
}
-
+
ossimString line;
while(!is.eof() && is.good())
@@ -937,7 +937,7 @@ bool ossimKeywordlist::parseStream(std::istream& is,
theMap.insert(std::make_pair(key, value));
}
}
-
+
} // End of: if(pos != line.npos)
} // End of: if(line != "")
@@ -1210,7 +1210,7 @@ void ossimKeywordlist::downcaseKeywords()
{
tempMap.insert(make_pair(ossimString::downcase(iter->first),
iter->second));
-
+
++iter;
}
theMap = tempMap;
@@ -1225,7 +1225,7 @@ void ossimKeywordlist::upcaseKeywords()
{
tempMap.insert(make_pair(ossimString::upcase(iter->first),
iter->second));
-
+
++iter;
}
theMap = tempMap;
diff --git a/Utilities/otbossim/src/ossim/font/.cvsignore b/Utilities/otbossim/src/ossim/font/.cvsignore
deleted file mode 100644
index a4383358ec..0000000000
--- a/Utilities/otbossim/src/ossim/font/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.d
diff --git a/Utilities/otbossim/src/ossim/imaging/.cvsignore b/Utilities/otbossim/src/ossim/imaging/.cvsignore
deleted file mode 100644
index a4383358ec..0000000000
--- a/Utilities/otbossim/src/ossim/imaging/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.d
diff --git a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
index 8f1433c727..9cc0abe32a 100644
--- a/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
+++ b/Utilities/otbossim/src/ossim/imaging/ossimImageHandlerFactory.cpp
@@ -27,9 +27,6 @@
#include <ossim/base/ossimTrace.h>
#include <ossim/base/ossimKeywordNames.h>
#include <ossim/imaging/ossimJpegTileSource.h>
-//#include <ossim/imaging/ossimRadarSatTileSource.h>
-// #include <ossim/imaging/ossimRadarSat2TileSource.h>
-// #include <ossim/imaging/ossimTerraSarTileSource.h>
static const ossimTrace traceDebug("ossimImageHandlerFactory:debug");
@@ -141,48 +138,6 @@ ossimImageHandler* ossimImageHandlerFactory::open(
}
result = 0;
- // test if Radarsat
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "Radarsat"
-// << std::endl;
-// }
-// result = new ossimRadarSatTileSource;
-// if(result->open(copyFilename))
-// {
-// return result.release();
-// }
-// result = 0;
-
- // test if Radarsat2
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "Radarsat2"
-// << std::endl;
-// }
-// result = new ossimRadarSat2TileSource;
-// if(result->open(copyFilename))
-// {
-// return result.release();
-// }
-// result = 0;
-
- // test if TerraSAR
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "trying TerraSAR"
-// << std::endl;
-// }
-// result = new ossimTerraSarTileSource;
-// if(result->open(copyFilename))
-// {
-// return result.release();
-// }
-// result = 0;
-
// this must be checked first before the TIFF handler
if(traceDebug())
{
@@ -514,51 +469,6 @@ ossimImageHandler* ossimImageHandlerFactory::open(const ossimKeywordlist& kwl,
result = 0;
- // RadarSat
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "trying RadarSat"
-// << std::endl;
-// }
-// result = new ossimRadarSatTileSource;
-// if(result->loadState(kwl, prefix))
-// {
-// return result.release();
-// }
-//
-// result = 0;
-
- // RadarSat2
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "trying RadarSat2"
-// << std::endl;
-// }
-// result = new ossimRadarSat2TileSource;
-// if(result->loadState(kwl, prefix))
-// {
-// return result.release();
-// }
-//
-// result = 0;
-
- // TerraSAR
-// if(traceDebug())
-// {
-// ossimNotify(ossimNotifyLevel_DEBUG)
-// << "trying TerraSAR"
-// << std::endl;
-// }
-// result = new ossimTerraSarTileSource;
-// if(result->loadState(kwl, prefix))
-// {
-// return result.release();
-// }
-//
-// result = 0;
-
// Must be before tiff...
if(traceDebug())
{
diff --git a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
index 28d05c88c2..4dd12ba583 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimSensorModelFactory.cpp
@@ -49,12 +49,6 @@ static ossimTrace traceDebug = ossimTrace("ossimSensorModelFactory:debug");
#include <ossim/projection/ossimApplanixEcefModel.h>
#include <ossim/support_data/ossimFfL7.h>
#include <ossim/support_data/ossimFfL5.h>
-//#include <ossim/projection/ossimRadarSatModel.h>
-//#include <ossim/projection/ossimEnvisatAsarModel.h>
-// #include <ossim/projection/ossimTerraSarModel.h>
-//#include <ossim/projection/ossimCosmoSkymedModel.h>
-// #include <ossim/projection/ossimRadarSat2Model.h>
-// #include <ossim/projection/ossimErsSarModel.h>
#include <ossim/projection/ossimTileMapModel.h>
//***
@@ -198,30 +192,6 @@ ossimSensorModelFactory::createProjection(const ossimString &name) const
{
return new ossimSarModel;
}
-// if (name == STATIC_TYPE_NAME(ossimRadarSatModel))
-// {
-// return new ossimRadarSatModel;
-// }
-// if (name == STATIC_TYPE_NAME(ossimEnvisatAsarModel))
-// {
-// return new ossimEnvisatAsarModel;
-// }
-// if (name == STATIC_TYPE_NAME(ossimTerraSarModel))
-// {
-// return new ossimTerraSarModel;
-// }
-// if (name == STATIC_TYPE_NAME(ossimCosmoSkymedModel))
-// {
-// return new ossimCosmoSkymedModel;
-// }
-// if (name == STATIC_TYPE_NAME(ossimRadarSat2Model))
-// {
-// return new ossimRadarSat2Model;
-// }
-// if (name == STATIC_TYPE_NAME(ossimErsSarModel))
-// {
-// return new ossimErsSarModel;
-// }
//***
// ADD_MODEL: (Please leave this comment for the next programmer)
//***
@@ -269,12 +239,6 @@ ossimSensorModelFactory::getTypeNameList(std::vector<ossimString>& typeList)
typeList.push_back(STATIC_TYPE_NAME(ossimFcsiModel));
typeList.push_back(STATIC_TYPE_NAME(ossimSpot5Model));
typeList.push_back(STATIC_TYPE_NAME(ossimSarModel));
-// typeList.push_back(STATIC_TYPE_NAME(ossimRadarSatModel));
-// typeList.push_back(STATIC_TYPE_NAME(ossimRadarSat2Model));
-// 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(ossimTileMapModel));
//***
// ADD_MODEL: Please leave this comment for the next programmer. Add above.
--
GitLab