From 66e65a448fa6984fd1f065499392f122e8eabe17 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 12 Jun 2012 12:35:42 +0200
Subject: [PATCH] COMP: fix otbapp_Segmentation
---
Applications/Segmentation/otbSegmentation.cxx | 18 +++++++++---------
...ingImageToOGRDataSourceSegmentationFilter.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Applications/Segmentation/otbSegmentation.cxx b/Applications/Segmentation/otbSegmentation.cxx
index 83d786c368..443aea9bb3 100644
--- a/Applications/Segmentation/otbSegmentation.cxx
+++ b/Applications/Segmentation/otbSegmentation.cxx
@@ -31,11 +31,11 @@
#include "otbWatershedSegmentationFilter.h"
// Large scale vectorization framework
-#include "otbStreamingVectorizedSegmentationOGR.h"
+#include "otbStreamingImageToOGRDataSourceSegmentationFilter.h"
#include "otbOGRDataSourceWrapper.h"
// Fusion filter
-#include "otbFusionOGRTileFilter.h"
+#include "otbOGRDataSourceStreamStitchingFilter.h"
namespace otb
{
@@ -95,28 +95,28 @@ public:
// Vectorize filters
// Edison mean-shift
- typedef otb::StreamingVectorizedSegmentationOGR
+ typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
<FloatVectorImageType,
EdisonSegmentationFilterType> EdisontreamingVectorizedSegmentationOGRType;
// Home made mean-shift
- typedef otb::StreamingVectorizedSegmentationOGR
+ typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
<FloatVectorImageType,
MeanShiftSegmentationFilterType> MeanShiftVectorizedSegmentationOGRType;
// Connected components
- typedef otb::StreamingVectorizedSegmentationOGR
+ typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
<FloatVectorImageType,
ConnectedComponentSegmentationFilterType>
ConnectedComponentStreamingVectorizedSegmentationOGRType;
- typedef otb::FusionOGRTileFilter
+ typedef otb::OGRDataSourceStreamStitchingFilter
<FloatVectorImageType> FusionFilterType;
// Watershed
- typedef otb::StreamingVectorizedSegmentationOGR
+ typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
<FloatImageType,
WatershedSegmentationFilterType> StreamingVectorizedWatershedFilterType;
@@ -322,12 +322,12 @@ private:
template<class TInputImage, class TSegmentationFilter>
FloatVectorImageType::SizeType
- GenericApplySegmentation(otb::StreamingVectorizedSegmentationOGR<TInputImage,
+ GenericApplySegmentation(otb::StreamingImageToOGRDataSourceSegmentationFilter<TInputImage,
TSegmentationFilter> * streamingVectorizedFilter, TInputImage * inputImage ,otb::ogr::DataSource::Pointer ogrDS, const unsigned int outputNb)
{
typedef TSegmentationFilter SegmentationFilterType;
typedef typename SegmentationFilterType::Pointer SegmentationFilterPointerType;
- typedef otb::StreamingVectorizedSegmentationOGR
+ typedef otb::StreamingImageToOGRDataSourceSegmentationFilter
<FloatVectorImageType,
SegmentationFilterType> StreamingVectorizedSegmentationOGRType;
diff --git a/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h b/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
index cd5c87e3cd..ac2d26ba8b 100644
--- a/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
+++ b/Code/Segmentation/otbStreamingImageToOGRDataSourceSegmentationFilter.h
@@ -93,12 +93,12 @@ class LabeledOutputAccessor<MeanShiftSmoothingImageFilter<TInputImage, TOutputIm
*/
template <class TImageType, class TSegmentationFilter>
class PersistentStreamingLabelImageToOGRDataSourceFilter
- : public otb::PersistentImageToOGRDataSourceFilter<TImageType>
+ : public otb::PersistentImageToOGRDataFilter<TImageType>
{
public:
/** Standard Self typedef */
typedef PersistentStreamingLabelImageToOGRDataSourceFilter Self;
- typedef PersistentImageToOGRDataSourceFilter<TImageType> Superclass;
+ typedef PersistentImageToOGRDataFilter<TImageType> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
--
GitLab