Changeset 27435 for trunk/Ohana/src/imregister/imreg/unique.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/unique.c (modified) (5 diffs)

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

@@ -2 +2 @@
 # include "imreg.h"
 
-void sortstr (char **S, int *X, int N) {
+void sortstr (char **S, off_t *X, off_t N) {
 
 # define SWAPFUNC(A,B){ \
-  char *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
-  int  itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
+  char  *tmp = S[A]; S[A] = S[B]; S[B] = tmp; \
+  off_t itmp = X[A]; X[A] = X[B]; X[B] = itmp; \
 }
 # define COMPARE(A,B)(strcmp(S[A], S[B]) < 0)
@@ -18 +18 @@
 
 /* input is a subset index of image list, output is a new subset */
-int *unique_entries (RegImage *image, int Nimage, int *subset, int *Nmatch) {
+off_t *unique_entries (RegImage *image, off_t Nimage, off_t *subset, off_t *Nmatch) {
 
-  int i, j, k, m, Nsubset;
-  int N, NMATCH;
-  int *match, *entry;
+  off_t i, j, k, m, Nsubset;
+  off_t N, NMATCH;
+  off_t *match, *entry;
   char idxline[128];
   char **index;
@@ -31 +31 @@
   N = 0;
   NMATCH = 1000;
-  ALLOCATE (match, int, NMATCH);
+  ALLOCATE (match, off_t, NMATCH);
 
   Nsubset = *Nmatch;
@@ -37 +37 @@
   /* index = filename.ccd */
   ALLOCATE (index, char *, Nsubset);
-  ALLOCATE (entry, int, Nsubset);
+  ALLOCATE (entry, off_t, Nsubset);
   for (i = 0; i < Nsubset; i++) {
     sprintf (idxline, "%s.%02d", image[subset[i]].filename, image[subset[i]].ccd);
@@ -63 +63 @@
     if (N == NMATCH) {
       NMATCH += 1000;
-      REALLOCATE (match, int, NMATCH);
+      REALLOCATE (match, off_t, NMATCH);
     }