Changeset 40477 for branches/czw_branch/20170908/Ohana/src/opihi/lib.shell/check_stack.c

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/lib.shell/check_stack.c (modified) (1 diff)

branches/czw_branch/20170908/Ohana/src/opihi/lib.shell/check_stack.c

@@ -48 +48 @@
           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");