From 64115419ba54c6120c26477095900277ba4aa82c Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 15 Jan 2010 16:30:45 +0800
Subject: [PATCH] BUG: correct include in ossimplugins
---
Utilities/otbossimplugins/CMakeLists.txt | 4 +++-
.../ossim/otb/CivilDateTime.cpp | 8 ++++----
.../otbossimplugins/ossim/otb/Coordinate.cpp | 2 +-
.../otbossimplugins/ossim/otb/Ephemeris.cpp | 2 +-
.../otbossimplugins/ossim/otb/Ephemeris.h | 2 +-
.../otbossimplugins/ossim/otb/Equation.cpp | 2 +-
.../ossim/otb/GMSTDateTime.cpp | 4 ++--
.../otbossimplugins/ossim/otb/GMSTDateTime.h | 2 +-
.../ossim/otb/GalileanEphemeris.cpp | 6 +++---
.../ossim/otb/GalileanEphemeris.h | 2 +-
.../ossim/otb/GeodesicCoordinate.cpp | 2 +-
.../ossim/otb/GeodesicCoordinate.h | 2 +-
.../ossim/otb/GeographicEphemeris.cpp | 6 +++---
.../ossim/otb/GeographicEphemeris.h | 2 +-
.../ossim/otb/HermiteInterpolator.cpp | 2 +-
.../otbossimplugins/ossim/otb/ImageNoise.cpp | 2 +-
.../ossim/otb/IncidenceAngles.cpp | 2 +-
.../ossim/otb/IncidenceAngles.h | 2 +-
.../ossim/otb/InfoIncidenceAngle.cpp | 2 +-
.../otbossimplugins/ossim/otb/JSDDateTime.cpp | 10 +++++-----
.../otbossimplugins/ossim/otb/JSDDateTime.h | 4 ++--
.../otbossimplugins/ossim/otb/JulianDate.cpp | 8 ++++----
.../otbossimplugins/ossim/otb/MJDDateTime.cpp | 2 +-
Utilities/otbossimplugins/ossim/otb/Noise.cpp | 2 +-
Utilities/otbossimplugins/ossim/otb/Noise.h | 2 +-
.../ossim/otb/PlatformPosition.cpp | 6 +++---
.../ossim/otb/PlatformPosition.h | 2 +-
.../ossim/otb/RectangularCoordinate.cpp | 4 ++--
.../ossim/otb/RectangularCoordinate.h | 2 +-
.../otbossimplugins/ossim/otb/RefPoint.cpp | 4 ++--
.../otbossimplugins/ossim/otb/SarSensor.cpp | 20 +++++++++----------
.../otbossimplugins/ossim/otb/SarSensor.h | 2 +-
.../otbossimplugins/ossim/otb/Sensor.cpp | 6 +++---
Utilities/otbossimplugins/ossim/otb/Sensor.h | 2 +-
.../ossim/otb/SensorParams.cpp | 2 +-
otbIncludeDirectories.cmake | 2 +-
36 files changed, 69 insertions(+), 67 deletions(-)
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 29fd08825b..b1459c9912 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -4,7 +4,9 @@ SET(ossimplugins_VERSION_MAJOR "1")
SET(ossimplugins_VERSION_MINOR "7")
SET(ossimplugins_VERSION_PATCH "15")
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ossim ${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+${CMAKE_CURRENT_SOURCE_DIR}/ossim
+#${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb
${OTB_SOURCE_DIR}/Utilities/otbossim/include
${OTB_BINARY_DIR}/Utilities/otbossim/include
# ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection
diff --git a/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
index 62468d3917..400a488320 100644
--- a/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
@@ -9,10 +9,10 @@
//----------------------------------------------------------------------------
// $Id$
-#include <JulianDate.h>
-#include <CivilDateTime.h>
-#include <JSDDateTime.h>
-#include <GMSTDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JSDDateTime.h>
+#include <otb/GMSTDateTime.h>
#include <cmath>
#include <cstring>
diff --git a/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp b/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
index 00ea2ee48f..9716545bf1 100644
--- a/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
@@ -10,7 +10,7 @@
// $Id$
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp b/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
index dad0ee288b..84b2be94d9 100644
--- a/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
#include <ossim/base/ossimDpt3d.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
index 95ecd86ce8..8f1060fabf 100644
--- a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
@@ -12,7 +12,7 @@
#ifndef Ephemeride_h
#define Ephemeride_h
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
class ossimKeywordlist;
diff --git a/Utilities/otbossimplugins/ossim/otb/Equation.cpp b/Utilities/otbossimplugins/ossim/otb/Equation.cpp
index 511457e876..10249b248f 100644
--- a/Utilities/otbossimplugins/ossim/otb/Equation.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Equation.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <Equation.h>
+#include <otb/Equation.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
index e293e7aeef..a67b1707e2 100644
--- a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
@@ -9,8 +9,8 @@
//----------------------------------------------------------------------------
// $Id$
-#include <GMSTDateTime.h>
-#include <CivilDateTime.h>
+#include <otb/GMSTDateTime.h>
+#include <otb/CivilDateTime.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
index a6a3abee29..046d5ba364 100644
--- a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
+++ b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
@@ -11,7 +11,7 @@
#ifndef GMSTDateTime_h
#define GMSTDateTime_h
-#include <JulianDate.h>
+#include <otb/JulianDate.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
index 0564aaebbf..3d585bdc32 100644
--- a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
@@ -9,10 +9,10 @@
//----------------------------------------------------------------------------
// $Id$
-#include <GalileanEphemeris.h>
-#include <GeographicEphemeris.h>
+#include <otb/GalileanEphemeris.h>
+#include <otb/GeographicEphemeris.h>
-#include <GMSTDateTime.h>
+#include <otb/GMSTDateTime.h>
#include <cmath>
diff --git a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
index f88b0c33b6..363b3db2fe 100644
--- a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
@@ -12,7 +12,7 @@
#ifndef GalileanEphemeride_h
#define GalileanEphemeride_h
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
index d76fd9eabd..3a2c66218c 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <GeodesicCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
index 40b64fe817..f4eef06a85 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
+++ b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
@@ -12,7 +12,7 @@
#ifndef GeodesicCoordinate_h
#define GeodesicCoordinate_h
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
index 7ce121f3fb..1274dd12df 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
@@ -9,10 +9,10 @@
//----------------------------------------------------------------------------
// $Id$
-#include <GeographicEphemeris.h>
-#include <GalileanEphemeris.h>
+#include <otb/GeographicEphemeris.h>
+#include <otb/GalileanEphemeris.h>
-#include <GMSTDateTime.h>
+#include <otb/GMSTDateTime.h>
#include <cmath>
diff --git a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
index 2776e6080b..7575ff8c3a 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
@@ -12,7 +12,7 @@
#ifndef GeographicEphemeride_h
#define GeographicEphemeride_h
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
index 6899b48316..b0eef0007c 100644
--- a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <HermiteInterpolator.h>
+#include <otb/HermiteInterpolator.h>
#include <string>
diff --git a/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp b/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
index b4cfd6a6dc..7a398f3e26 100644
--- a/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <ImageNoise.h>
+#include <otb/ImageNoise.h>
#include <ossim/base/ossimDpt3d.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
index f81c6181d7..34d8d5557e 100644
--- a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <IncidenceAngles.h>
+#include <otb/IncidenceAngles.h>
#include <ossim/base/ossimDpt3d.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
index 9e0dac19f2..d204fc10f7 100644
--- a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
+++ b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
@@ -12,7 +12,7 @@
#ifndef IncidenceAngles_h
#define IncidenceAngles_h
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
#include <otb/InfoIncidenceAngle.h>
#include <ossim/base/ossimConstants.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp b/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
index 2c0648617c..a391af906d 100644
--- a/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <InfoIncidenceAngle.h>
+#include <otb/InfoIncidenceAngle.h>
#include <ossim/base/ossimDpt3d.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
index b73f97576c..a17eb926e0 100644
--- a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
@@ -9,12 +9,12 @@
//----------------------------------------------------------------------------
// $Id$
-#include <JSDDateTime.h>
-#include <CivilDateTime.h>
-#include <JulianDate.h>
-#include <GMSTDateTime.h>
+#include <otb/JSDDateTime.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/GMSTDateTime.h>
-#include <Arithmetic.h>
+#include <otb/Arithmetic.h>
#include <cmath>
#include <cstring>
diff --git a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
index ce134cf558..8f2c001c3f 100644
--- a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
+++ b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
@@ -11,8 +11,8 @@
#ifndef JSDDateTime_h
#define JSDDateTime_h
-#include <JulianDate.h>
-#include <MJDDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/MJDDateTime.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp b/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
index edd3f095fe..9a061a6358 100644
--- a/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
@@ -9,10 +9,10 @@
//----------------------------------------------------------------------------
// $Id$
-#include <CivilDateTime.h>
-#include <JulianDate.h>
-#include <JSDDateTime.h>
-#include <GMSTDateTime.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/JSDDateTime.h>
+#include <otb/GMSTDateTime.h>
#include <cmath>
diff --git a/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
index f762e8a525..334fb2f67a 100644
--- a/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <MJDDateTime.h>
+#include <otb/MJDDateTime.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/Noise.cpp b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
index ea12fa0d26..991900e14c 100644
--- a/Utilities/otbossimplugins/ossim/otb/Noise.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <Noise.h>
+#include <otb/Noise.h>
#include <ossim/base/ossimDpt3d.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/Noise.h b/Utilities/otbossimplugins/ossim/otb/Noise.h
index f6d6ff303b..cf0fc644a2 100644
--- a/Utilities/otbossimplugins/ossim/otb/Noise.h
+++ b/Utilities/otbossimplugins/ossim/otb/Noise.h
@@ -12,7 +12,7 @@
#ifndef Noise_h
#define Noise_h
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
#include <otb/ImageNoise.h>
#include <ossim/base/ossimConstants.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
index 242f5fa08b..22fa9c7e3c 100644
--- a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
@@ -10,9 +10,9 @@
// $Id$
-#include <PlatformPosition.h>
-#include <Ephemeris.h>
-#include <HermiteInterpolator.h>
+#include <otb/PlatformPosition.h>
+#include <otb/Ephemeris.h>
+#include <otb/HermiteInterpolator.h>
#include <ossim/base/ossimKeywordlist.h>
#include <iostream>
diff --git a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
index 5fb5f82942..a557c05079 100644
--- a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
+++ b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
@@ -12,7 +12,7 @@
#ifndef PlatformPosition_h
#define PlatformPosition_h
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
class ossimKeywordlist;
diff --git a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
index 74d944c4a3..0000aa0be4 100644
--- a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
@@ -9,8 +9,8 @@
//----------------------------------------------------------------------------
// $Id$
-#include <RectangularCoordinate.h>
-#include <GeodesicCoordinate.h>
+#include <otb/RectangularCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
#include <cmath>
diff --git a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
index 4b7c2162b9..840b80b5c8 100644
--- a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
+++ b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
@@ -12,7 +12,7 @@
#ifndef RectangularCoordinate_h
#define RectangularCoordinate_h
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp b/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
index abe9e52352..10ff381798 100644
--- a/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
@@ -9,8 +9,8 @@
//----------------------------------------------------------------------------
// $Id$
-#include <RefPoint.h>
-#include <Ephemeris.h>
+#include <otb/RefPoint.h>
+#include <otb/Ephemeris.h>
#include <cstring>
#include <ossim/base/ossimKeywordlist.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp b/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
index 8aebed4706..8c29d1f782 100644
--- a/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
@@ -9,16 +9,16 @@
//----------------------------------------------------------------------------
// $Id$
-#include <SarSensor.h>
-#include <JSDDateTime.h>
-#include <Ephemeris.h>
-#include <GeographicEphemeris.h>
-#include <Sensor.h>
-#include <SensorParams.h>
-#include <PlatformPosition.h>
-#include <Equation.h>
-#include <RectangularCoordinate.h>
-#include <GeodesicCoordinate.h>
+#include <otb/SarSensor.h>
+#include <otb/JSDDateTime.h>
+#include <otb/Ephemeris.h>
+#include <otb/GeographicEphemeris.h>
+#include <otb/Sensor.h>
+#include <otb/SensorParams.h>
+#include <otb/PlatformPosition.h>
+#include <otb/Equation.h>
+#include <otb/RectangularCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
#include <complex>
namespace ossimplugins
diff --git a/Utilities/otbossimplugins/ossim/otb/SarSensor.h b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
index 1ca778e256..28dc42c7b5 100644
--- a/Utilities/otbossimplugins/ossim/otb/SarSensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
@@ -12,7 +12,7 @@
#ifndef SarSensor_h
#define SarSensor_h
-#include <Sensor.h>
+#include <otb/Sensor.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/Sensor.cpp b/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
index 6e676c7a92..433b7e7fb8 100644
--- a/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
@@ -9,9 +9,9 @@
//----------------------------------------------------------------------------
// $Id$
-#include <Sensor.h>
-#include <SensorParams.h>
-#include <PlatformPosition.h>
+#include <otb/Sensor.h>
+#include <otb/SensorParams.h>
+#include <otb/PlatformPosition.h>
#include <cstring>
diff --git a/Utilities/otbossimplugins/ossim/otb/Sensor.h b/Utilities/otbossimplugins/ossim/otb/Sensor.h
index 1f3a1d2291..f76e6fb4f3 100644
--- a/Utilities/otbossimplugins/ossim/otb/Sensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/Sensor.h
@@ -12,7 +12,7 @@
#ifndef Services_h
#define Services_h
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
namespace ossimplugins
{
diff --git a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
index 37c2df4178..0f924fd679 100644
--- a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
@@ -9,7 +9,7 @@
//----------------------------------------------------------------------------
// $Id$
-#include <SensorParams.h>
+#include <otb/SensorParams.h>
#include <ossim/base/ossimKeywordlist.h>
#include <ossim/base/ossimString.h>
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 98fe0a733a..594f5bb6c0 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -56,7 +56,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
# ${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/projection
# Add otbossimplugins/ossim/otb into the include directories path
${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
- ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim/otb
+# ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim/otb
${OTB_SOURCE_DIR}/Utilities/dxflib
${OTB_SOURCE_DIR}/Utilities/InsightJournal
${OTB_SOURCE_DIR}/Utilities/otb6S
--
GitLab