Commit 18366025 authored by Emmanuel Christophe's avatar Emmanuel Christophe

Backed out changeset 74b54041f0a8

parent ca052786
......@@ -19,8 +19,9 @@
#define __otbImageKeywordlist_h
#include <iostream>
#include <map>
#include "itkLightObject.h"
#include "itkObject.h"
#include "itkObjectFactory.h"
#include "base/ossimString.h"
......@@ -40,22 +41,20 @@ namespace otb
* \ingroup Projections
*
*/
class ITK_EXPORT ImageKeywordlist : public itk::LightObject
class ITK_EXPORT ImageKeywordlist
{
public:
/** Standard class typedefs. */
typedef ImageKeywordlist Self;
typedef itk::LightObject Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
typedef ImageKeywordlist Self;
/** Creation through the object factory */
itkNewMacro(Self);
/** Standard type macros */
itkTypeMacro(ImageKeywordlist, itk::LightObject);
//virtual const char *GetNameOfClass() const
//{return "ImageKeywordlist";}
typedef std::map<ossimString, ossimString> KeywordlistMap;
/** Run-time type information (and related methods). */
itkTypeMacro(ImageKeywordlist, ImageKeywordlist);
/** Get the internal map container */
const KeywordlistMap& GetKeywordlist() const
{
......
......@@ -38,23 +38,18 @@ namespace otb
*
*/
class VectorDataKeywordlist : public itk::LightObject
class VectorDataKeywordlist
{
public:
/** Smart pointer typedef support. */
typedef VectorDataKeywordlist Self;
typedef itk::LightObject Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
/** Creation through the object factory */
itkNewMacro(Self);
/** Standard type macros */
itkTypeMacro(VectorDataKeywordlist, itk::LightObject);
typedef VectorDataKeywordlist Self;
typedef std::pair<OGRFieldDefn*, OGRField> FieldType;
typedef std::vector<FieldType> FieldListType;
virtual const char *GetNameOfClass() const
{return "VectorDataKeywordlist"; }
void AddField(OGRFieldDefn* fieldDefn, OGRField* field);
/**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment