From 0c7abdd8c2be1c9179756eb8435bcaa9cd6e01e9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 12 Jun 2012 13:28:56 +0200
Subject: [PATCH] ENH: missing renaming of VectorDataToImage -> VectorDataToMap
---
Applications/Rasterization/otbRasterization.cxx | 10 +++++-----
Code/Common/otbVectorDataStyle.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Applications/Rasterization/otbRasterization.cxx b/Applications/Rasterization/otbRasterization.cxx
index d65e047cdd..87647edfba 100644
--- a/Applications/Rasterization/otbRasterization.cxx
+++ b/Applications/Rasterization/otbRasterization.cxx
@@ -21,7 +21,7 @@
#include "otbVectorDataExtractROI.h"
#include "otbVectorDataProjectionFilter.h"
#include "otbVectorDataProperties.h"
-#include "otbVectorDataToImageFilter.h"
+#include "otbVectorDataToMapFilter.h"
#include "otbGeoInformationConversion.h"
#include "otbRemoteSensingRegion.h"
@@ -57,7 +57,7 @@ public:
typedef VectorDataProperties<VectorDataType> VectorDataPropertiesType;
// Rasterization
- typedef otb::VectorDataToImageFilter<VectorDataType, UInt8ImageType> VectorDataToImageFilterType;
+ typedef otb::VectorDataToMapFilter<VectorDataType, UInt8ImageType> VectorDataToMapFilterType;
// Misc
typedef otb::RemoteSensingRegion<double> RemoteSensingRegionType;
@@ -242,13 +242,13 @@ private:
m_Vdextract->SetRegion(region);
m_Vdextract->SetInput(m_Vproj->GetOutput());
- m_VectorDataRendering = VectorDataToImageFilterType::New();
+ m_VectorDataRendering = VectorDataToMapFilterType::New();
m_VectorDataRendering->SetInput(m_Vdextract->GetOutput());
m_VectorDataRendering->SetSize(size);
m_VectorDataRendering->SetOrigin(origin);
m_VectorDataRendering->SetSpacing(spacing);
m_VectorDataRendering->SetVectorDataProjectionWKT(outputProjectionRef);
- m_VectorDataRendering->SetRenderingStyleType(VectorDataToImageFilterType::Binary);
+ m_VectorDataRendering->SetRenderingStyleType(VectorDataToMapFilterType::Binary);
UInt8ImageType::Pointer outputImage = m_VectorDataRendering->GetOutput();
if (HasValue("im"))
@@ -265,7 +265,7 @@ private:
VectorDataPropertiesType::Pointer m_VdProperties;
VectorDataProjectionFilterType::Pointer m_Vproj;
VectorDataExtractROIType::Pointer m_Vdextract;
- VectorDataToImageFilterType::Pointer m_VectorDataRendering;
+ VectorDataToMapFilterType::Pointer m_VectorDataRendering;
};
diff --git a/Code/Common/otbVectorDataStyle.h b/Code/Common/otbVectorDataStyle.h
index 103bea95af..b2d862a1a8 100644
--- a/Code/Common/otbVectorDataStyle.h
+++ b/Code/Common/otbVectorDataStyle.h
@@ -28,7 +28,7 @@ namespace otb
/** \class VectorDataStyle
* \brief Load style into a mapnik::Map
*
- * \sa VectorDataToImageFilter
+ * \sa VectorDataToMapFilter
*/
class ITK_EXPORT VectorDataStyle : public itk::LightObject
--
GitLab