Enable read/write of std::size_t properties.

rinkk · Feb 4, 2016 · 5d4cfc5 · 5d4cfc5
1 parent 63fd3a6
commit 5d4cfc5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/InSituLib/VtkMappedMeshSource.cpp b/InSituLib/VtkMappedMeshSource.cpp
@@ -96,6 +96,7 @@ int VtkMappedMeshSource::RequestData(vtkInformation *,
 		if (addProperty<double>(properties, *name)) continue;
 		if (addProperty<int>(properties, *name)) continue;
 		if (addProperty<unsigned>(properties, *name)) continue;
+		if (addProperty<std::size_t>(properties, *name)) continue;
 		if (addProperty<char>(properties, *name)) continue;
 
 		DBUG ("Mesh property \"%s\" with unknown data type.", *name->c_str());

diff --git a/MeshLib/MeshGenerators/VtkMeshConverter.cpp b/MeshLib/MeshGenerators/VtkMeshConverter.cpp
@@ -25,6 +25,7 @@
 #include <vtkBitArray.h>
 #include <vtkCharArray.h>
 #include <vtkUnsignedCharArray.h>
+#include <vtkUnsignedLongArray.h>
 #include <vtkDoubleArray.h>
 #include <vtkIntArray.h>
 
@@ -231,6 +232,12 @@ void VtkMeshConverter::convertArray(vtkDataArray &array, MeshLib::Properties &pr
 		return;
 	}
 
+	if (vtkUnsignedLongArray::SafeDownCast(&array))
+	{
+		VtkMeshConverter::convertTypedArray<unsigned long>(array, properties, type);
+		return;
+	}
+
 	if (vtkUnsignedIntArray::SafeDownCast(&array))
 	{
 		// MaterialIDs are assumed to be integers