Changeset 27838 for branches/tap_branches/Ohana/src/imregister/imreg/iminfo.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/imregister/imreg/iminfo.c (modified) (4 diffs)

branches/tap_branches/Ohana/src/imregister/imreg/iminfo.c

@@ -2 +2 @@
 # include "imreg.h"
 
-char *getcwd_cfht ();
+char *getcwd_cfht (char *, int);
 
 RegImage *iminfo (char *filename) {
@@ -42 +42 @@
 
   /* determine data layout (SINGLE, SPLIT, MEF, CUBE, SLICE) */
-  gfits_scan (&header, "EXTEND",  "%t", 1, &extend);
+  gfits_scan_alt (&header, "EXTEND",  "%t", 1, &extend);
   gfits_scan (&header, "NAXIS",  "%d", 1, &Naxes);
   if (extend) { /* MEF file */
@@ -68 +68 @@
 
   /* extract other relevant data from header */
-  gfits_scan (&header, ImagetypeKeyword,  "%s", 1, &Imagetype);
+  gfits_scan (&header, ImagetypeKeyword,  "%s", 1, (char *)&Imagetype);
 
   /* grab the image type : if not defined, set to 'none' */
@@ -108 +108 @@
       ohana_dms_to_ddd (&tmp, line);
       image[0].ra = 15*tmp;
-      gfits_scan (&header, DECSexigKeyword, "%s", 1, &line);
+      gfits_scan (&header, DECSexigKeyword, "%s", 1, (char *)&line);
       ohana_dms_to_ddd (&tmp, line);
       image[0].dec = tmp;