Changeset 27435 for trunk/Ohana/src/imregister/imreg/match.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/imregister/imreg/match.c (modified) (3 diffs)

trunk/Ohana/src/imregister/imreg/match.c

@@ -2 +2 @@
 # include "imreg.h"
 
-int *match_criteria (RegImage *image, int Nimage, int *Nmatch) {
+off_t *match_criteria (RegImage *image, off_t Nimage, off_t *Nmatch) {
 
-  int i, j, Nname;
-  int N, NMATCH;
-  int *match;
-  int reject;
+  off_t i, j, Nname;
+  off_t N, NMATCH;
+  off_t *match;
+  off_t reject;
 
   /* create selection index */
   N = 0;
   NMATCH = 1000;
-  ALLOCATE (match, int, NMATCH);
+  ALLOCATE (match, off_t, NMATCH);
 
   Nname = 0;
@@ -36 +36 @@
     if (N == NMATCH) {
       NMATCH += 1000;
-      REALLOCATE (match, int, NMATCH);
+      REALLOCATE (match, off_t, NMATCH);
     }
   }
@@ -43 +43 @@
 }
 
-int *match_images (RegImage *image, int Nimage, RegImage *subset, int Nsubset, int *Nmatch) {
+off_t *match_images (RegImage *image, off_t Nimage, RegImage *subset, off_t Nsubset, off_t *Nmatch) {
   
-  int i, j, N, Nfound;
-  int *match;
+  off_t i, j, N, Nfound;
+  off_t *match;
 
   /* find matching images - very inefficient : sort by obstime, find those first? */
-  ALLOCATE (match, int, Nsubset);
+  ALLOCATE (match, off_t, Nsubset);
   for (j = 0; j < Nsubset; j++) {
     match[j] = -1;