From 72fb83f5c852f01149e6d9c24d69c587798a097e Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Wed, 17 Sep 2008 14:15:15 +0000
Subject: [PATCH] BUG: pointer instead of smart pointer
---
Code/Common/otbDataNode.h | 10 +++++-----
Code/Common/otbDataNode.txx | 6 +++---
Code/Common/otbObjectList.h | 2 +-
Code/Common/otbObjectList.txx | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Code/Common/otbDataNode.h b/Code/Common/otbDataNode.h
index d21077bc7e..baae05a858 100644
--- a/Code/Common/otbDataNode.h
+++ b/Code/Common/otbDataNode.h
@@ -19,7 +19,7 @@
#define __otb_DataNode_h
#include "itkPoint.h"
-#include "itkPolyLineParametricPath.h"
+#include "otbPolyLineParametricPathWithValue.h"
#include "otbPolygon.h"
#include "otbObjectList.h"
@@ -67,7 +67,7 @@ class DataNode
/** Internal data typedef */
typedef itk::Point<PrecisionType,VDimension> PointType;
- typedef itk::PolyLineParametricPath<VDimension> LineType;
+ typedef otb::PolyLineParametricPathWithValue<double,VDimension> LineType;
typedef typename LineType::Pointer LinePointerType;
typedef Polygon<PrecisionType> PolygonType;
typedef typename PolygonType::Pointer PolygonPointerType;
@@ -121,18 +121,18 @@ class DataNode
* Set the line data. Node type is automatically set to FEATURE_LINE.
* \param line The line.
*/
- void SetLine(LinePointerType line);
+ void SetLine(LineType* line);
/**
* Set the polygon exterior ring. Node type is automatically set to FEATURE_POLYGON.
* \param polygon The polygon exterior ring.
*/
- void SetPolygonExteriorRing(PolygonPointerType polygon);
+ void SetPolygonExteriorRing(PolygonType* polygon);
/**
* Set the polygon interior rings. Node type is automatically set to FEATURE_POLYGON.
* \param polygonList The polygon interior rings list.
*/
- void SetPolygonInteriorRings(PolygonListPointerType polygonList);
+ void SetPolygonInteriorRings(PolygonListType* polygonList);
/**
* \return True if node type is DOCUMENT.
diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx
index c698320afe..38fea41e1d 100644
--- a/Code/Common/otbDataNode.txx
+++ b/Code/Common/otbDataNode.txx
@@ -52,7 +52,7 @@ DataNode<TPrecision,VDimension>
template <class TPrecision, unsigned int VDimension>
void DataNode<TPrecision,VDimension>
-::SetLine(LinePointerType line)
+::SetLine(LineType* line)
{
m_NodeType = FEATURE_LINE;
m_Data.line = line;
@@ -61,7 +61,7 @@ template <class TPrecision, unsigned int VDimension>
template <class TPrecision, unsigned int VDimension>
void
DataNode<TPrecision,VDimension>
-::SetPolygonExteriorRing(PolygonPointerType polygon)
+::SetPolygonExteriorRing(PolygonType* polygon)
{
m_NodeType = FEATURE_POLYGON;
m_Data.exteriorRing = polygon;
@@ -75,7 +75,7 @@ DataNode<TPrecision,VDimension>
template <class TPrecision, unsigned int VDimension>
void
DataNode<TPrecision,VDimension>
-::SetPolygonInteriorRings(PolygonListPointerType polygonList)
+ ::SetPolygonInteriorRings(PolygonListType* polygonList)
{
m_NodeType = FEATURE_POLYGON;
m_Data.interiorRings = polygonList;
diff --git a/Code/Common/otbObjectList.h b/Code/Common/otbObjectList.h
index 38f38c7879..ee9d515754 100644
--- a/Code/Common/otbObjectList.h
+++ b/Code/Common/otbObjectList.h
@@ -75,7 +75,7 @@ public:
* Append an element to the list.
* \param element Pointer to the element to append.
*/
- void PushBack(ObjectPointerType element);
+ void PushBack(ObjectType* element);
/**
* Set the nth element of the list.
* \param index The index where to put the element.
diff --git a/Code/Common/otbObjectList.txx b/Code/Common/otbObjectList.txx
index 0806ec9eee..58ee9321a5 100644
--- a/Code/Common/otbObjectList.txx
+++ b/Code/Common/otbObjectList.txx
@@ -80,7 +80,7 @@ namespace otb
template <class TObject>
void
ObjectList<TObject>
- ::PushBack(ObjectPointerType element)
+ ::PushBack(ObjectType* element)
{
m_InternalContainer.push_back(element);
}
--
GitLab