Changeset 2625 for trunk/packages/vizservers/vtkvis

Timestamp:

Oct 14, 2011 9:10:24 AM (13 years ago)

Author:

ldelgass

Message:

Fix crash on setting constant color mode

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpCutplane.cpp (modified) (1 diff)
• RpPseudoColor.cpp (modified) (2 diffs)
• RpStreamlines.cpp (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpCutplane.cpp

@@ -8 +8 @@
 #include <cassert>
 #include <cfloat>
+#include <cstring>
 
 #include <vtkDataSet.h>

trunk/packages/vizservers/vtkvis/RpPseudoColor.cpp

@@ -8 +8 @@
 #include <cassert>
 #include <cfloat>
+#include <cstring>
 
 #include <vtkDataSet.h>
@@ -292 +293 @@
     _colorMode = mode;
     _colorFieldType = type;
-    _colorFieldName = name;
+    if (name == NULL)
+        _colorFieldName.clear();
+    else
+        _colorFieldName = name;
     if (range == NULL) {
         _colorFieldRange[0] = DBL_MAX;

trunk/packages/vizservers/vtkvis/RpStreamlines.cpp

@@ -10 +10 @@
 #include <cfloat>
 #include <cmath>
+#include <cstring>
 
 #include <vtkMath.h>
@@ -1338 +1339 @@
     _colorMode = mode;
     _colorFieldType = type;
-    _colorFieldName = name;
+    if (name == NULL)
+        _colorFieldName.clear();
+    else
+        _colorFieldName = name;
     if (range == NULL) {
         _colorFieldRange[0] = DBL_MAX;