Index: trunk/Ohana/src/opihi/dvo/cmpread.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/cmpread.c	(revision 5386)
+++ trunk/Ohana/src/opihi/dvo/cmpread.c	(revision 7080)
@@ -41,5 +41,5 @@
 
   /* load FITS header */
-  if (!fits_read_header (argv[2], &header)) {
+  if (!gfits_read_header (argv[2], &header)) {
     fprintf (stderr, "ERROR: can't read header for %s\n", argv[2]);
     return (FALSE);
@@ -49,5 +49,5 @@
     if (!GetCoords (&coords, &header)) {
       fprintf (stderr, "can't get WCS info from header\n");
-      fits_free_header (&header);
+      gfits_free_header (&header);
       return (FALSE);
     }
@@ -58,5 +58,5 @@
   if (f == NULL) {
     fprintf (stderr, "ERROR: can't read data from %s\n", argv[2]);
-    fits_free_header (&header);
+    gfits_free_header (&header);
     return (FALSE);
   }
@@ -64,7 +64,7 @@
 
   /* find expected number of stars */
-  if (!fits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
+  if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     fprintf (stderr, "ERROR: can't get NSTARS from header\n");
-    fits_free_header (&header);
+    gfits_free_header (&header);
     return (FALSE);
   }
@@ -72,8 +72,8 @@
   /* read from FITS table or from text table */
   extend = FALSE;
-  fits_scan (&header, "EXTEND",  "%t", 1, &extend);
+  gfits_scan (&header, "EXTEND",  "%t", 1, &extend);
   if (extend) {
     fprintf (stderr, "reading from FITS cmp file %s\n", argv[2]);
-    Nbytes = fits_matrix_size (&header);
+    Nbytes = gfits_matrix_size (&header);
     fseek (f, Nbytes, SEEK_CUR); 
     stars = cmpReadFits (f, &Nstars);
@@ -81,5 +81,5 @@
     /* allocate space for stars */
     fprintf (stderr, "reading from TEXT cmp file %s\n", argv[2]);
-    if (!fits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
+    if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
       fprintf (stderr, "ERROR: failed to find NSTARS\n");
       exit (1);
@@ -138,5 +138,5 @@
   }      
   free (stars);
-  fits_free_header (&header);
+  gfits_free_header (&header);
   fprintf (stderr, "loaded %d objects\n", Nstars);
   return (TRUE);