Changeset 32610

Timestamp:

Nov 3, 2011, 7:39:25 PM (15 years ago)

Author:

eugene

Message:

failed to move pointer to new memory when reallocating vector

File:

• branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c (modified) (2 diffs)

branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c

@@ -1 +1 @@
 # include "astro.h"
 
-# define FLUX(BUF,X,Y) { out[Nvec] = BUF[(int)(X) + ((int)(Y))*Nx]; Nvec++; }
+# define FLUX(BUF,X,Y) {                                                \
+        char valid = TRUE;                                              \
+        valid &= (X >= 0);                                              \
+        valid &= (Y >= 0);                                              \
+        valid &= (X < Nx);                                              \
+        valid &= (Y < Ny);                                              \
+        if (valid) {                                                    \
+            out[Nvec] = BUF[(int)(X) + ((int)(Y))*Nx];                  \
+            Nvec++;                                                     \
+            if (Nvec >= vec[0].Nelements) abort();                      \
+        }                                                               \
+    }
+
 # define C1 0
 
@@ -64 +76 @@
           // counting error here
         ResetVector (vec, OPIHI_FLT, vec[0].Nelements + 64);
+        out = vec[0].elements.Flt;
       }