From cb4f472a708081620e7c79fae21ec176b21d900c Mon Sep 17 00:00:00 2001 From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org> Date: Sun, 20 Mar 2011 18:01:19 -0700 Subject: [PATCH] ENH: decrease ossim coupling --- Code/Projections/otbGenericMapProjection.h | 4 +++- Code/Projections/otbGenericMapProjection.txx | 8 ++++++++ Code/Projections/otbMapProjection.h | 9 +-------- Code/Projections/otbMapProjection.txx | 9 +++++++++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Code/Projections/otbGenericMapProjection.h b/Code/Projections/otbGenericMapProjection.h index 362f5aa8b5..930619686c 100644 --- a/Code/Projections/otbGenericMapProjection.h +++ b/Code/Projections/otbGenericMapProjection.h @@ -21,10 +21,12 @@ #include <iostream> #include <sstream> #include <stdio.h> -#include "projection/ossimProjection.h" + #include "itkTransform.h" #include "itkExceptionObject.h" #include "itkMacro.h" + +#include "projection/ossimProjection.h" #include "base/ossimGpt.h" #include "base/ossimDpt.h" #include "projection/ossimProjection.h" diff --git a/Code/Projections/otbGenericMapProjection.txx b/Code/Projections/otbGenericMapProjection.txx index 60e32659b1..d5c8af6a3f 100644 --- a/Code/Projections/otbGenericMapProjection.txx +++ b/Code/Projections/otbGenericMapProjection.txx @@ -20,8 +20,16 @@ #include "otbGenericMapProjection.h" #include "otbMacro.h" + #include "projection/ossimMapProjectionFactory.h" #include "projection/ossimMapProjection.h" +#include "base/ossimGpt.h" +#include "base/ossimDpt.h" +#include "projection/ossimProjection.h" +#include "base/ossimEllipsoid.h" +#include "base/ossimEllipsoidFactory.h" +#include "base/ossimString.h" +#include "gdal/ossimOgcWktTranslator.h" namespace otb { diff --git a/Code/Projections/otbMapProjection.h b/Code/Projections/otbMapProjection.h index 2c4d0ebda3..edfc1413de 100644 --- a/Code/Projections/otbMapProjection.h +++ b/Code/Projections/otbMapProjection.h @@ -21,17 +21,10 @@ #include <iostream> #include <sstream> #include <stdio.h> -#include "projection/ossimMapProjection.h" + #include "itkTransform.h" #include "itkExceptionObject.h" #include "itkMacro.h" -#include "base/ossimGpt.h" -#include "base/ossimDpt.h" -#include "projection/ossimProjection.h" -#include "base/ossimEllipsoid.h" -#include "base/ossimEllipsoidFactory.h" -#include "base/ossimString.h" -#include "gdal/ossimOgcWktTranslator.h" #include "otbGenericMapProjection.h" namespace otb diff --git a/Code/Projections/otbMapProjection.txx b/Code/Projections/otbMapProjection.txx index a87f3ee47d..9631fc644e 100644 --- a/Code/Projections/otbMapProjection.txx +++ b/Code/Projections/otbMapProjection.txx @@ -21,6 +21,15 @@ #include "otbMapProjection.h" #include "otbMacro.h" +#include "projection/ossimMapProjection.h" +#include "base/ossimGpt.h" +#include "base/ossimDpt.h" +#include "projection/ossimProjection.h" +#include "base/ossimEllipsoid.h" +#include "base/ossimEllipsoidFactory.h" +#include "base/ossimString.h" +#include "gdal/ossimOgcWktTranslator.h" + namespace otb { -- GitLab