Changeset 1384 for trunk/packages/vizservers

Timestamp:

Apr 6, 2009, 10:19:50 AM (15 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Switch.h (modified) (1 diff)
• dxReader.cpp (modified) (3 diffs)

trunk/packages/vizservers/nanovis/Switch.h

@@ -35 +35 @@
 #endif /* HAVE_STDDEF_H */
 
-#ifndef Offset
 #ifdef offsetof
-#define Offset(type, field) ((int) offsetof(type, field))
+#define SwitchOffset(type, field) ((int) offsetof(type, field))
 #else
-#define Offset(type, field) ((int) ((char *) &((type *) 0)->field))
+#define SwitchOffset(type, field) ((int) ((char *) &((type *) 0)->field))
 #endif
-#endif /* Offset */
 
 namespace Rappture {

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -92 +92 @@
         }
         if (sscanf(line, "object %*d class gridpositions counts %d %d %d", 
-                   &nx, &ny, &nz) == 4) {
+                   &nx, &ny, &nz) == 3) {
             printf("w:%d h:%d d:%d\n", nx, ny, nz);
             // found grid size
@@ -107 +107 @@
             }
         } else if (sscanf(line, "object %*d class array type %*s shape 3"
-                " rank 1 items %d data follows", &npts) == 3) {
+                " rank 1 items %d data follows", &npts) == 1) {
             printf("point %d\n", npts);
             if (npts != nx*ny*nz) {
@@ -116 +116 @@
             break;
         } else if (sscanf(line, "object %*d class array type %*s rank 0"
-                " times %d data follows", &npts) == 3) {
+                " times %d data follows", &npts) == 1) {
             if (npts != nx*ny*nz) {
                 result.addError("inconsistent data: expected %d points"