Changeset 38062 for trunk/Ohana/src/opihi/lib.shell/check_stack.c

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.shell/check_stack.c (modified) (2 diffs)

trunk/Ohana/src/opihi/lib.shell/check_stack.c

@@ -6 +6 @@
 int check_stack (StackVar *stack, int Nstack, int validsize) {
 
-  int i, Nx, Ny, Nv, size;
+  int i, Nx, Ny, Nz, Nv, size;
   char *c1, *c2;
 
-  Nv = Nx = Ny = -1;
+  Nv = Nx = Ny = Nz = -1;
 
   for (i = 0; i < Nstack; i++) {
@@ -46 +46 @@
           Nx = stack[i].buffer[0].matrix.Naxis[0];
           Ny = stack[i].buffer[0].matrix.Naxis[1];
+          Nz = stack[i].buffer[0].matrix.Naxis[2];
         } 
-        if ((Nx != stack[i].buffer[0].matrix.Naxis[0]) && (Ny != stack[i].buffer[0].matrix.Naxis[1])) {
+        if ((Nx != stack[i].buffer[0].matrix.Naxis[0]) && 
+            (Ny != stack[i].buffer[0].matrix.Naxis[1]) && 
+            (Nz != stack[i].buffer[0].matrix.Naxis[2])) {
           push_error ("dimensions don't match");
           return (-1);