Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/lib.shell/stack_math.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.shell/stack_math.c (modified) (5 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/lib.shell/stack_math.c

@@ -628 +628 @@
 
 # define MS_FUNC(OP) {                                  \
-    if (V2->type == 's')  {                             \
+    if (V2->type == 'S')  {                             \
       opihi_flt M2 = V2[0].FltValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M1++) {        \
@@ -635 +635 @@
       break;                                            \
     }                                                   \
-    if (V2->type == 'S')  {                             \
+    if (V2->type == 's')  {                             \
       opihi_int M2 = V2[0].IntValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M1++) {        \
@@ -704 +704 @@
 
 # define SM_FUNC(OP) {                                  \
-    if (V1->type == 's')  {                             \
+    if (V1->type == 'S')  {                             \
       opihi_flt M1 = V1[0].FltValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M2++) {        \
@@ -711 +711 @@
       break;                                            \
     }                                                   \
-    if (V1->type == 'S')  {                             \
+    if (V1->type == 's')  {                             \
       opihi_int M1 = V1[0].IntValue;                    \
       for (i = 0; i < Nx*Ny; i++, out++, M2++) {        \
@@ -1135 +1135 @@
   /* copy all but the matrix */
 
-  matrix2[0].unsign = matrix1[0].unsign;
-  matrix2[0].bitpix = matrix1[0].bitpix;
-  matrix2[0].size   = matrix1[0].size;
-  matrix2[0].bzero  = matrix1[0].bzero;
-  matrix2[0].bscale = matrix1[0].bscale;
-  matrix2[0].Naxes  = matrix1[0].Naxes;
-  for (i = 0; i < FT_MAX_NAXES; i++) 
+  matrix2[0].unsign   = matrix1[0].unsign;
+  matrix2[0].bitpix   = matrix1[0].bitpix;
+  matrix2[0].datasize = matrix1[0].datasize;
+  matrix2[0].bzero    = matrix1[0].bzero;
+  matrix2[0].bscale   = matrix1[0].bscale;
+  matrix2[0].Naxes    = matrix1[0].Naxes;
+  for (i = 0; i < FT_MAX_NAXES; i++) {
     matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
-
+  }
 
   return (TRUE);