Changeset 27838 for branches/tap_branches/Ohana/src/opihi/dvo/ImageOps.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/ImageOps.c (modified) (4 diffs)

branches/tap_branches/Ohana/src/opihi/dvo/ImageOps.c

@@ -1 +1 @@
 # include "dvoshell.h"
 
-void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset,
+void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset,
                    SkyRegionSelection *selection, 
                    unsigned long int tzero, double trange, int TimeSelect) 
 {
 
-  int i, j, flipped, status, InPic;
-  int *subset;
-  int N, n, npts;
+  int j, flipped, status, InPic;
+  off_t i, n, *subset;
+  int npts;
   double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid;
   Graphdata graph;
@@ -26 +26 @@
   }
 
+  patch.Rmin = 0;
+  patch.Rmax = 0;
+  patch.Dmin = 0;
+  patch.Dmax = 0;
   if (selection->useSkyregion) {
     double Rs, Re, Ds, De;
@@ -44 +48 @@
 
   npts = 200;
-  ALLOCATE (subset, int, npts);
-  n = N = 0;
+  ALLOCATE (subset, off_t, npts);
+  n = 0;
   for (i = 0; i < Nimage; i++) {
     if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue;
@@ -114 +118 @@
     if (n > npts - 1) {
       npts += 200;
-      REALLOCATE (subset, int, npts);
+      REALLOCATE (subset, off_t, npts);
     }
   }
 
-  REALLOCATE (subset, int, MAX (n, 1));
+  REALLOCATE (subset, off_t, MAX (n, 1));
   *Subset = subset;
   *Nsubset = n;