From d66f2dd72f8d672565452b40606361bed0d70587 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Tue, 28 Apr 2009 13:01:47 +0200
Subject: [PATCH] ENH: Ossim warning corrections : missing virtual for
destructors classes and 2 cast
---
Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp | 4 ++--
Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp | 4 ++--
Utilities/otbossimplugins/ossim/otb/Ephemeris.h | 2 +-
Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h | 4 ++--
Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h | 2 +-
Utilities/otbossimplugins/ossim/otb/SarSensor.h | 2 +-
Utilities/otbossimplugins/ossim/otb/Sensor.h | 2 +-
Utilities/otbossimplugins/ossim/otb/SensorParams.h | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp b/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
index a9fe414324..569eafff44 100644
--- a/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimCosmoSkymedModel.cpp
@@ -81,7 +81,7 @@ bool ossimCosmoSkymedModel::InitSensorParams(const ossimKeywordlist &kwl, const
/**
- * @todo : � voir sur de vrais produits (exemples de DESCENDING et ASCENDING)
+ * @todo : � voir sur de vrais produits (exemples de DESCENDING et ASCENDING)
*/
const char* orbitDirection_str = kwl.find(prefix,"orbitDirection");
std::string orbitDirection(orbitDirection_str) ;
@@ -376,7 +376,7 @@ bool ossimCosmoSkymedModel::UtcDateTimeStringToCivilDate(const std::string &utcS
outputDate.set_year(atoi(year_str));
outputDate.set_month(atoi(month_str));
outputDate.set_day(atoi(day_str));
- outputDate.set_second(0.0);
+ outputDate.set_second(0);
outputDate.set_decimal(0.0);
return true ;
diff --git a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
index 83f8135cbb..7430a38db7 100644
--- a/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
+++ b/Utilities/otbossimplugins/ossim/ossimRadarSat2ProductDoc.cpp
@@ -415,7 +415,7 @@ bool ossimRadarSat2ProductDoc::initImageSize(const ossimXmlDocument* xdoc,
ossimString s;
if ( getNumberOfSamplesPerLine(xdoc, s) )
{
- imageSize.x = s.toFloat64();
+ imageSize.x = static_cast<ossim_int32>(s.toFloat64());
}
else
{
@@ -423,7 +423,7 @@ bool ossimRadarSat2ProductDoc::initImageSize(const ossimXmlDocument* xdoc,
}
if ( getNumberOfLines(xdoc, s) )
{
- imageSize.y = s.toFloat64();
+ imageSize.y = static_cast<ossim_int32>(s.toFloat64());
}
else
{
diff --git a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
index 8e48f4f9de..da58ede926 100644
--- a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
@@ -28,7 +28,7 @@ public:
/**
* @brief Destructor
*/
- ~Ephemeris();
+ virtual ~Ephemeris();
/**
* @brief Constructor with initialisations
diff --git a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
index ad508ec23a..cafff3bd39 100644
--- a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
@@ -30,7 +30,7 @@ public:
/**
* @brief Destructor
*/
- ~GalileanEphemeris();
+ virtual ~GalileanEphemeris();
/**
* @brief Constructor with initialisations
@@ -49,7 +49,7 @@ public:
GalileanEphemeris& operator=(const GalileanEphemeris& rhs);
/**
- * @brief This fonction converts the current ephemeris in the Geographic coordinates syst�m
+ * @brief This fonction converts the current ephemeris in the Geographic coordinates syst�m
*/
void ToGeographic(GeographicEphemeris* vGeo);
void ToGeographic(double greenwich,GeographicEphemeris* vGeo);
diff --git a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
index 32dabdedcd..2245197b99 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
@@ -29,7 +29,7 @@ public:
/**
* @brief Destructor
*/
- ~GeographicEphemeris();
+ virtual ~GeographicEphemeris();
/**
* @brief Constructor with initialisations
diff --git a/Utilities/otbossimplugins/ossim/otb/SarSensor.h b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
index 7854dd46f9..e0816d7665 100644
--- a/Utilities/otbossimplugins/ossim/otb/SarSensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
@@ -35,7 +35,7 @@ public:
/**
* @brief Destructor
*/
- ~SarSensor();
+ virtual ~SarSensor();
/**
* @brief This function is able to convert image coordinates into geodetic world coordinates using a geometric SAR sensor model
diff --git a/Utilities/otbossimplugins/ossim/otb/Sensor.h b/Utilities/otbossimplugins/ossim/otb/Sensor.h
index fa135a6fa9..44ac37eac0 100644
--- a/Utilities/otbossimplugins/ossim/otb/Sensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/Sensor.h
@@ -34,7 +34,7 @@ public:
/**
* @brief Destructor
*/
- ~Sensor();
+ virtual ~Sensor();
/**
* @brief This function is able to convert image coordinates into geodetic world coordinates using a sensor model
diff --git a/Utilities/otbossimplugins/ossim/otb/SensorParams.h b/Utilities/otbossimplugins/ossim/otb/SensorParams.h
index ba38282cbd..ff86ab9a0e 100644
--- a/Utilities/otbossimplugins/ossim/otb/SensorParams.h
+++ b/Utilities/otbossimplugins/ossim/otb/SensorParams.h
@@ -36,7 +36,7 @@ public:
/**
* @brief Destructor
*/
- ~SensorParams();
+ virtual ~SensorParams();
/**
*@brief Copy constructor
--
GitLab