Changeset 27517 for branches/eam_branches/20100225/Ohana/src/opihi/dvo/match_image.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/match_image.c (modified) (2 diffs)

branches/eam_branches/20100225/Ohana/src/opihi/dvo/match_image.c

@@ -1 +1 @@
 # include "dvoshell.h"
 
-int match_image (Image *image, int Nimage, unsigned int T, short int S) {
+off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) {
 
-  int N, Nlo, Nhi, N1, N2;
+  off_t N, Nlo, Nhi, N1, N2;
 
   /* bracket first value of interest */
@@ -37 +37 @@
 }
 
-int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S) {
+off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) {
 
-  int N, Nlo, Nhi, N1, N2;
+  off_t N, Nlo, Nhi, N1, N2;
 
   /* bracket first value of interest */