Changeset 3135 for trunk/packages/vizservers/vtkvis

Timestamp:

Aug 3, 2012, 12:12:49 AM (12 years ago)

Author:

ldelgass

Message:

GetPointData?()->GetArray?(i) can return NULL when the i-th array is not a
vtkDataArray (a vtkAbstractArray, e.g a string array)

File:

• trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -715 +715 @@
             for (int i = 0; i < _dataSet->GetPointData()->GetNumberOfArrays(); i++) {
                 if (numComponents == -1 ||
-                    _dataSet->GetPointData()->GetArray(i)->GetNumberOfComponents() == numComponents) {
+                    (_dataSet->GetPointData()->GetArray(i) != NULL &&
+                     _dataSet->GetPointData()->GetArray(i)->GetNumberOfComponents() == numComponents)) {
                     names.push_back(_dataSet->GetPointData()->GetArrayName(i));
                 }
@@ -725 +726 @@
             for (int i = 0; i < _dataSet->GetCellData()->GetNumberOfArrays(); i++) {
                 if (numComponents == -1 ||
-                    _dataSet->GetCellData()->GetArray(i)->GetNumberOfComponents() == numComponents) {
+                    (_dataSet->GetCellData()->GetArray(i) != NULL &&
+                     _dataSet->GetCellData()->GetArray(i)->GetNumberOfComponents() == numComponents)) {
                     names.push_back(_dataSet->GetCellData()->GetArrayName(i));
                 }
@@ -735 +737 @@
             for (int i = 0; i < _dataSet->GetFieldData()->GetNumberOfArrays(); i++) {
                 if (numComponents == -1 ||
-                    _dataSet->GetFieldData()->GetArray(i)->GetNumberOfComponents() == numComponents) {
+                    (_dataSet->GetFieldData()->GetArray(i) != NULL &&
+                     _dataSet->GetFieldData()->GetArray(i)->GetNumberOfComponents() == numComponents)) {
                     names.push_back(_dataSet->GetFieldData()->GetArrayName(i));
                 }