Changeset 4609 for vtkvis/branches/1.7/RendererCmd.cpp

Timestamp:

Aug 2, 2014 1:01:34 AM (9 years ago)

Author:

ldelgass

Message:

more fix merges

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• RendererCmd.cpp (modified) (3 diffs)

vtkvis/branches/1.7/RendererCmd.cpp

@@ -2337 +2337 @@
         objPtr = Tcl_NewStringObj("render_start", 12);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-        /* server */
-        objPtr = Tcl_NewStringObj("server", 6);
+        /* renderer */
+        objPtr = Tcl_NewStringObj("renderer", 8);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         objPtr = Tcl_NewStringObj("vtkvis", 6);
@@ -2346 +2346 @@
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewIntObj(getpid()));
-        /* machine */
-        objPtr = Tcl_NewStringObj("machine", 7);
+        /* host */
+        objPtr = Tcl_NewStringObj("host", 4);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         gethostname(buf, BUFSIZ-1);
@@ -4622 +4622 @@
     g_renderer->addDataSet(name);
     if (!g_renderer->setData(name, data, nbytes)) {
+        free(data);
+        g_renderer->deleteDataSet(name);
         USER_ERROR("Failed to load data for dataset \"%s\"", name);
-        free(data);
         return TCL_ERROR;
     }