diff --git a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp index f2a7f95309e89ad47dd7ff033603f3e497c56142..cce553ad75ba46b672f76f14f332f140297048d1 100644 --- a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp +++ b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.cpp @@ -20,7 +20,7 @@ #include <ossim/base/ossimTrace.h> #include <otb/RefPoint.h> -#include <ers/AlosPalsar/AlosPalsarLeader/AlosPalsarLeader.h> +#include <AlosPalsar/AlosSarLeader.h> #include <otb/SensorParams.h> #include <otb/PlatformPosition.h> #include <ossim/base/ossimKeywordNames.h> @@ -41,7 +41,7 @@ RTTI_DEF1(ossimAlosPalsarModel, "ossimAlosPalsarModel", ossimGeometricSarSensorM ossimAlosPalsarModel::ossimAlosPalsarModel(): theNumberSRGR(0), thePixelSpacing(0), - theAlosPalsarleader(NULL) + theAlosSarLeader(NULL) { theSRGRCoeffset[0][0]=0.0; theSRGRCoeffset[0][1]=0.0; @@ -150,13 +150,13 @@ bool ossimAlosPalsarModel::open(const ossimFilename& file) /* * Creation of the class allowing to store Leader file metadata */ - if(theAlosPalsarleader != NULL) + if(theAlosSarLeader != NULL) { - delete theAlosPalsarleader; - theAlosPalsarleader = NULL; + delete theAlosSarLeader; + theAlosSarLeader = NULL; } - theAlosPalsarleader = new AlosPalsarLeader(); + theAlosSarLeader = new AlosSarLeader(); if ( leaFilename.exists() ) { @@ -178,7 +178,7 @@ bool ossimAlosPalsarModel::open(const ossimFilename& file) * Leader file data reading */ std::ifstream leaderFile(leaFilename, ios::in|ios::binary); - leaderFile>>*theAlosPalsarleader; + leaderFile>>*theAlosSarLeader; leaderFile.close(); if(traceDebug()) @@ -220,13 +220,13 @@ bool ossimAlosPalsarModel::saveState(ossimKeywordlist& kwl, //kwl.add(prefix, ossimKeywordNames::TYPE_KW, "ossimAlosPalsarModel", true); - if (theAlosPalsarleader == NULL) + if (theAlosSarLeader == NULL) { - std::cout << "Error: AlosPalsarleader is NULL" << std::endl; + std::cout << "Error: AlosSarLeader is NULL" << std::endl; return false; } - result = theAlosPalsarleader->saveState(kwl); + result = theAlosSarLeader->saveState(kwl); if (traceDebug()) { diff --git a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.h b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.h index 85d6245837fd90f0fdad55db8a7c1afa4dd8b7f2..603e546c3b31cac08fd465adeb055b70cf5041bc 100644 --- a/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.h +++ b/Utilities/otbossimplugins/ossim/ossimAlosPalsarModel.h @@ -30,7 +30,7 @@ namespace ossimplugins class PlatformPosition; class SensorParams; class RefPoint; -class AlosPalsarLeader; +class AlosSarLeader; /** * @brief This class is able to direct localisation and indirect localisation using the AlosPalsar sensor model * @@ -114,7 +114,7 @@ private: /** * @brief List of metadata contained in the Leader file */ - AlosPalsarLeader *theAlosPalsarleader; + AlosSarLeader *theAlosSarLeader;