Changeset 2809

Timestamp:

Mar 6, 2012, 11:33:59 AM (13 years ago)

Author:

ldelgass

Message:

Unirect2d/3d::ParseBuffer? returns a Tcl status code, but if
Tcl_ListObjGetElements() failed, it was returning NULL, which as an int is
equivalent to TCL_OK. Return value has been changed to TCL_ERROR.

Location:

trunk/packages/vizservers/nanovis

Files:

• ParticleSystem.cpp (modified) (2 diffs)
• Unirect.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/ParticleSystem.cpp

@@ -36 +36 @@
 // TEST
 extern void*
-LoadFlowDx(const char* fname, int& width, int& height, int&depth,
+LoadFlowDx(const char* fname, int& width, int& height, int& depth,
            float& min, float& max, float& nonzero_min, 
            float& axisScaleX, float& axisScaleY, float& axisScaleZ);
@@ -77 +77 @@
 }
 
-void* ParticleSystem::dataLoadMain(void *data)
+void *ParticleSystem::dataLoadMain(void *data)
 {
     ParticleSystem* particleSystem = (ParticleSystem*) data;

trunk/packages/vizservers/nanovis/Unirect.cpp

@@ -45 +45 @@
     int objc;
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return NULL;
+        return TCL_ERROR;
     }
     int result;
@@ -64 +64 @@
     int objc;
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
-        return NULL;
+        return TCL_ERROR;
     }
     int result;