Index: trunk/Ohana/src/opihi/dvo/simage.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/simage.c	(revision 4689)
+++ trunk/Ohana/src/opihi/dvo/simage.c	(revision 7080)
@@ -39,5 +39,5 @@
   
   /* read header */
-  if (!fits_read_header (argv[1], &header)) {
+  if (!gfits_read_header (argv[1], &header)) {
     fprintf (stderr, "ERROR: can't find image file %s\n", argv[1]);
     return (FALSE);
@@ -45,39 +45,39 @@
   /* get astrometry information */
   strcpy (coords.ctype, "NONE");
-  fits_scan (&header, "CTYPE1",   "%s",  1, coords.ctype);
+  gfits_scan (&header, "CTYPE1",   "%s",  1, coords.ctype);
   if (strcmp (coords.ctype, "RA---PLY")) {
     fprintf (stderr, "ERROR: wrong astrometric info in header\n");
     return (FALSE);
   }
-  fits_scan (&header, "CDELT1",   "%f", 1, &coords.cdelt1); 
-  fits_scan (&header, "CDELT2",   "%f", 1, &coords.cdelt2);
-  fits_scan (&header, "CRVAL1",   "%lf", 1, &coords.crval1);
-  fits_scan (&header, "CRVAL2",   "%lf", 1, &coords.crval2);  
-  fits_scan (&header, "CRPIX1",   "%f", 1, &coords.crpix1);
-  fits_scan (&header, "CRPIX2",   "%f", 1, &coords.crpix2);
-  fits_scan (&header, "PC001001", "%f", 1, &coords.pc1_1);
-  fits_scan (&header, "PC001002", "%f", 1, &coords.pc1_2);
-  fits_scan (&header, "PC002001", "%f", 1, &coords.pc2_1);
-  fits_scan (&header, "PC002002", "%f", 1, &coords.pc2_2);
+  gfits_scan (&header, "CDELT1",   "%f", 1, &coords.cdelt1); 
+  gfits_scan (&header, "CDELT2",   "%f", 1, &coords.cdelt2);
+  gfits_scan (&header, "CRVAL1",   "%lf", 1, &coords.crval1);
+  gfits_scan (&header, "CRVAL2",   "%lf", 1, &coords.crval2);  
+  gfits_scan (&header, "CRPIX1",   "%f", 1, &coords.crpix1);
+  gfits_scan (&header, "CRPIX2",   "%f", 1, &coords.crpix2);
+  gfits_scan (&header, "PC001001", "%f", 1, &coords.pc1_1);
+  gfits_scan (&header, "PC001002", "%f", 1, &coords.pc1_2);
+  gfits_scan (&header, "PC002001", "%f", 1, &coords.pc2_1);
+  gfits_scan (&header, "PC002002", "%f", 1, &coords.pc2_2);
   /* RA Terms */
-  fits_scan (&header, "PCA1X2Y0", "%f", 1, &coords.polyterms[0][0]);
-  fits_scan (&header, "PCA1X1Y1", "%f", 1, &coords.polyterms[1][0]);
-  fits_scan (&header, "PCA1X0Y2", "%f", 1, &coords.polyterms[2][0]);
-  fits_scan (&header, "PCA1X3Y0", "%f", 1, &coords.polyterms[3][0]);
-  fits_scan (&header, "PCA1X2Y1", "%f", 1, &coords.polyterms[4][0]);
-  fits_scan (&header, "PCA1X1Y2", "%f", 1, &coords.polyterms[5][0]);
-  fits_scan (&header, "PCA1X0Y3", "%f", 1, &coords.polyterms[6][0]);
+  gfits_scan (&header, "PCA1X2Y0", "%f", 1, &coords.polyterms[0][0]);
+  gfits_scan (&header, "PCA1X1Y1", "%f", 1, &coords.polyterms[1][0]);
+  gfits_scan (&header, "PCA1X0Y2", "%f", 1, &coords.polyterms[2][0]);
+  gfits_scan (&header, "PCA1X3Y0", "%f", 1, &coords.polyterms[3][0]);
+  gfits_scan (&header, "PCA1X2Y1", "%f", 1, &coords.polyterms[4][0]);
+  gfits_scan (&header, "PCA1X1Y2", "%f", 1, &coords.polyterms[5][0]);
+  gfits_scan (&header, "PCA1X0Y3", "%f", 1, &coords.polyterms[6][0]);
   /* Dec Terms */			    
-  fits_scan (&header, "PCA2X2Y0", "%f", 1, &coords.polyterms[0][1]);
-  fits_scan (&header, "PCA2X1Y1", "%f", 1, &coords.polyterms[1][1]);
-  fits_scan (&header, "PCA2X0Y2", "%f", 1, &coords.polyterms[2][1]);
-  fits_scan (&header, "PCA2X3Y0", "%f", 1, &coords.polyterms[3][1]);
-  fits_scan (&header, "PCA2X2Y1", "%f", 1, &coords.polyterms[4][1]);
-  fits_scan (&header, "PCA2X1Y2", "%f", 1, &coords.polyterms[5][1]);
-  fits_scan (&header, "PCA2X0Y3", "%f", 1, &coords.polyterms[6][1]);
+  gfits_scan (&header, "PCA2X2Y0", "%f", 1, &coords.polyterms[0][1]);
+  gfits_scan (&header, "PCA2X1Y1", "%f", 1, &coords.polyterms[1][1]);
+  gfits_scan (&header, "PCA2X0Y2", "%f", 1, &coords.polyterms[2][1]);
+  gfits_scan (&header, "PCA2X3Y0", "%f", 1, &coords.polyterms[3][1]);
+  gfits_scan (&header, "PCA2X2Y1", "%f", 1, &coords.polyterms[4][1]);
+  gfits_scan (&header, "PCA2X1Y2", "%f", 1, &coords.polyterms[5][1]);
+  gfits_scan (&header, "PCA2X0Y3", "%f", 1, &coords.polyterms[6][1]);
   coords.Npolyterms = 2; /* how many do we use? */
 
   /* find number of stars */
-  fits_scan (&header, "NSTARS", "%d", 1, &Nstars);
+  gfits_scan (&header, "NSTARS", "%d", 1, &Nstars);
   if (Nstars == 0) {
     fprintf (stderr, "no stars in file\n");