Commit ee5b2087 authored by Andy Wilson's avatar Andy Wilson
Browse files

COMP: Forgot to back out a couple of changes from my own playpen

parent c92c8568
......@@ -34,7 +34,7 @@
#include <vtkstd/string>
using vtkstd::string;
vtkCxxRevisionMacro(vtkAbstractArray, "1.2");
vtkCxxRevisionMacro(vtkAbstractArray, "1.3");
// Construct object with sane defaults.
......@@ -148,7 +148,6 @@ unsigned long vtkAbstractArray::GetDataTypeSize(int type)
return sizeof(vtkIdType);
break;
case VTK_CELL:
case VTK_STRING:
return 0;
break;
......@@ -162,7 +161,7 @@ unsigned long vtkAbstractArray::GetDataTypeSize(int type)
// ----------------------------------------------------------------------
#if 0
vtkAbstractArray* vtkAbstractArray::CreateArray(int dataType)
{
switch (dataType)
......@@ -208,3 +207,4 @@ vtkAbstractArray* vtkAbstractArray::CreateArray(int dataType)
return vtkDoubleArray::New();
}
}
#endif
......@@ -177,7 +177,12 @@ public:
// XXX FIXME Find this macro and move it into vtkTypeNames.h or
// something.
virtual const char *GetDataTypeAsString( void )
{ return vtkTypeNameMacro( this->GetDataType() ); }
{ return vtkImageScalarTypeNameMacro( this->GetDataType() ); }
// This function will only make sense once vtkDataArray is
// re-parented to be a subclass of vtkAbstractArray. It is
// commented out for now.
// Description:
// Creates an array for dataType where dataType is one of
......@@ -187,7 +192,8 @@ public:
// VTK_STRING, VTK_CELL.
// Note that the data array returned has be deleted by the
// user.
static vtkAbstractArray* CreateArray(int dataType);
// static vtkAbstractArray* CreateArray(int dataType);
// Description:
// This method is here to make backward compatibility easier. It
......
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