Changeset 27517 for branches/eam_branches/20100225/Ohana/src/opihi/dvo/LoadImages.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/LoadImages.c (modified) (3 diffs)

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

@@ -1 +1 @@
 # include "dvoshell.h"
 
-Image *LoadImages (int *nimage) {
+Image *LoadImages (off_t *Nimage) {
 
   int status;
@@ -25 +25 @@
     gprint (GP_ERR, "note: image catalog is empty\n");
     ALLOCATE (image, Image, 1);
-    *nimage = 1;
+    *Nimage = 1;
     return (image);
   }
@@ -37 +37 @@
   }
 
-  image = gfits_table_get_Image (&db.ftable, nimage, &db.swapped);
+  image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped);
   return (image);
 }