diff --git a/Code/IO/otbMapProjectionWrapper.cxx b/Code/IO/otbMapProjectionWrapper.cxx index 29e9a63fc38c0877ed8d94b342b46146bab4c5a5..bba8a4c44830ddc1cfbed7f483b9853440bb1eec 100644 --- a/Code/IO/otbMapProjectionWrapper.cxx +++ b/Code/IO/otbMapProjectionWrapper.cxx @@ -39,7 +39,7 @@ namespace otb { MapProjectionWrapper::MapProjectionWrapper(): - m_MapProjection(NULL), m_ProjectionRefWkt(""), reinstanciateProjection(true) + m_MapProjection(NULL), m_ProjectionRefWkt(""), m_ReinstanciateProjection(true) { } @@ -54,7 +54,7 @@ MapProjectionWrapper::~MapProjectionWrapper() MapProjectionWrapper::InternalMapProjectionPointer MapProjectionWrapper::GetMapProjection() { itkDebugMacro("returning MapProjection address " << this->m_MapProjection); - if ((reinstanciateProjection) || (m_MapProjection == NULL)) + if ((m_ReinstanciateProjection) || (m_MapProjection == NULL)) { this->InstanciateProjection(); } @@ -65,7 +65,7 @@ MapProjectionWrapper::InternalMapProjectionPointer MapProjectionWrapper::GetMapP MapProjectionWrapper::InternalMapProjectionConstPointer MapProjectionWrapper::GetMapProjection() const { itkDebugMacro("returning MapProjection address " << this->m_MapProjection); - if ((reinstanciateProjection) || (m_MapProjection == NULL)) + if ((m_ReinstanciateProjection) || (m_MapProjection == NULL)) { itkExceptionMacro(<< "m_MapProjection not up-to-date, call InstanciateProjection() first"); } @@ -92,7 +92,7 @@ std::string MapProjectionWrapper::GetWkt() void MapProjectionWrapper::SetWkt(std::string projectionRefWkt) { this->m_ProjectionRefWkt = projectionRefWkt; - reinstanciateProjection = true; + m_ReinstanciateProjection = true; // this->InstanciateProjection(); Should not be needed... this->Modified(); } @@ -100,13 +100,13 @@ void MapProjectionWrapper::SetWkt(std::string projectionRefWkt) void MapProjectionWrapper::SetParameter(std::string key, std::string value) { m_ParameterStore[key] = value; - reinstanciateProjection = true; + m_ReinstanciateProjection = true; this->Modified(); } bool MapProjectionWrapper::InstanciateProjection() { - if ((this->reinstanciateProjection) || (m_MapProjection == NULL)) + if ((this->m_ReinstanciateProjection) || (m_MapProjection == NULL)) { ossimKeywordlist kwl; ossimOgcWktTranslator wktTranslator; @@ -153,7 +153,7 @@ bool MapProjectionWrapper::InstanciateProjection() } - this->reinstanciateProjection = false; + this->m_ReinstanciateProjection = false; this->ApplyParametersToProjection(); return true; } diff --git a/Code/IO/otbMapProjectionWrapper.h b/Code/IO/otbMapProjectionWrapper.h index a373de286fcc1cfe1d25fe7c069fe578312d6883..d9ac41736b14a7916c48a2fd0a553c781cf4d41e 100644 --- a/Code/IO/otbMapProjectionWrapper.h +++ b/Code/IO/otbMapProjectionWrapper.h @@ -50,7 +50,7 @@ public: typedef itk::SmartPointer<Self> Pointer; typedef itk::SmartPointer<const Self> ConstPointer; - typedef ossimProjection* InternalMapProjectionPointer; + typedef ossimProjection* InternalMapProjectionPointer; typedef const ossimProjection* InternalMapProjectionConstPointer; /** Method for creation through the object factory. */ @@ -79,8 +79,6 @@ protected: MapProjectionWrapper(); virtual ~MapProjectionWrapper(); - - private: MapProjectionWrapper(const Self &); //purposely not implemented void operator =(const Self&); //purposely not implemented @@ -93,7 +91,7 @@ private: typedef std::map<std::string, std::string> StoreType; StoreType m_ParameterStore; - bool reinstanciateProjection; + bool m_ReinstanciateProjection; }; } // namespace otb