Changeset 3863 for branches/1.3

Timestamp:

Aug 9, 2013 4:00:21 PM (11 years ago)

Author:

ldelgass

Message:

Update mergeinfo, plus cherrypick a couple trivial changes from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkviewer.tcl (modified) (1 diff)
• packages/vizservers/vtkvis/Makefile.in (modified) (1 diff)

branches/1.3/gui/scripts/vtkviewer.tcl

@@ -907 +907 @@
         if 0 {
             set f [open "last.ppm" "w"] 
-            puts $f $bytes
+            fconfigure $f -encoding binary
+            puts -nonewline $f $bytes
             close $f
         }

branches/1.3/packages/vizservers/vtkvis/Makefile.in

@@ -188 +188 @@
 
 $(SERVER): $(SERVER_OBJS)
-        $(CXX) $(LIBS) -o $@ $(SERVER_OBJS)
+        $(CXX) -o $@ $(SERVER_OBJS) $(LIBS)
 
 install: all