Changeset 1170

Timestamp:

Oct 2, 2008 12:28:18 PM (16 years ago)

Author:

gah

Message:

64-bit fixes

Location:

trunk/packages/vizservers/nanovis

Files:

• BucketSort.cpp (modified) (1 diff)
• PointSet.cpp (modified) (1 diff)
• RpDX.cpp (modified) (2 diffs)
• nanovis.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/BucketSort.cpp

@@ -21 +21 @@
 
     Vector3 pos;
-    for (; c <= end; c = (Cluster*) ((int) c + sizeof(Cluster))) {
+    for (; c <= end; c = (Cluster*) ((char *)c + sizeof(Cluster))) {
         pos.transform(c->centroid, cameraMat);
         addBucket(c, pos.length()*_invMaxLength);

trunk/packages/vizservers/nanovis/PointSet.cpp

@@ -51 +51 @@
     int index;
     float d = _max - _min;
-    for (/*empty*/; c <= end; c = (PCA::Cluster*)((int)c+sizeof(PCA::Cluster))){
+    for (/*empty*/; c <= end; c = (PCA::Cluster*)((char *)c+sizeof(PCA::Cluster))){
         points = c->points;
         numOfPoints = c->numOfPoints;

trunk/packages/vizservers/nanovis/RpDX.cpp

@@ -60 +60 @@
     }
 
-    fprintf(stdout, "dxobj=%x\n", (unsigned int)_dxobj);
-    fflush(stdout);
-
     // parse out the positions array 
 
@@ -306 +303 @@
     fflush(stdout);
     interpolator = DXNewInterpolator(_dxobj,INTERP_INIT_IMMEDIATE,-1.0);
-    fprintf(stdout, "DXNewInterpolator=%x\n", (unsigned int)interpolator);
     fprintf(stdout,"_rank = %i\n",_rank);
     fprintf(stdout,"_shape = %i\n",_shape);

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -1189 +1189 @@
 
     char command[200];
-    sprintf(command, "%s %d\n", prefix, header_length + data_length);
+    sprintf(command, "%s %lu\n", prefix, 
+        (unsigned long)header_length + data_length);
 
     size_t wordsPerRow = (win_width * 24 + 31) / 32;