From 074ea12b9d0fbd94d6631e4ffadd9aa894b3eaaa Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 25 Feb 2012 21:42:41 +0100
Subject: [PATCH] OSSIM: fix missing ossim namespace causing compilation error
with icc
---
Utilities/otbossim/src/ossim/base/ossimGpt.cpp | 4 ++--
Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp | 2 +-
Utilities/otbossim/src/ossim/projection/ossimRS1SarModel.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Utilities/otbossim/src/ossim/base/ossimGpt.cpp b/Utilities/otbossim/src/ossim/base/ossimGpt.cpp
index 1c58e5743f..c52d4babca 100644
--- a/Utilities/otbossim/src/ossim/base/ossimGpt.cpp
+++ b/Utilities/otbossim/src/ossim/base/ossimGpt.cpp
@@ -457,9 +457,9 @@ double ossimGpt::azimuthTo(const ossimGpt& gpt) const
// Use alternate local method (not great circle):
double mean_lat = 0.5*(lat + gpt.lat);
- double dlon = cosd(mean_lat)*(gpt.lon - lon);
+ double dlon = ossim::cosd(mean_lat)*(gpt.lon - lon);
double dlat = gpt.lat - lat;
- double theta = atan2d(dlon,dlat);
+ double theta = ossim::atan2d(dlon,dlat);
if (theta < 0)
theta += 360.0;
return theta;
diff --git a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
index 1cfb7eb3e9..cb61cf2fc0 100644
--- a/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
+++ b/Utilities/otbossim/src/ossim/parallel/ossimOrthoIgen.cpp
@@ -2902,7 +2902,7 @@ void ossimOrthoIgen::setProductGsd()
{
// Need to adjust the resolution in the longitude direction if the user requested geo-scaling:
if (!ossim::isnan(theGeoScalingLatitude))
- resolution.lon = resolution.lat/cosd(theGeoScalingLatitude);
+ resolution.lon = resolution.lat/ossim::cosd(theGeoScalingLatitude);
theProductProjection->setDecimalDegreesPerPixel(resolution);
}
else
diff --git a/Utilities/otbossim/src/ossim/projection/ossimRS1SarModel.cpp b/Utilities/otbossim/src/ossim/projection/ossimRS1SarModel.cpp
index 01858649ec..d78fed2ffd 100644
--- a/Utilities/otbossim/src/ossim/projection/ossimRS1SarModel.cpp
+++ b/Utilities/otbossim/src/ossim/projection/ossimRS1SarModel.cpp
@@ -686,7 +686,7 @@ void ossimRS1SarModel::eciToEcfXform(const double& acq_time, NEWMAT::Matrix& xfo
// Establish rotation:
double cos_gha = ossim::cosd(gha);
- double sin_gha = sind(gha);
+ double sin_gha = ossim::sind(gha);
// Establish rotation matrix:
xform = ossimMatrix3x3::create(cos_gha, sin_gha, 0.0,
--
GitLab