Index: trunk/Ohana/src/opihi/cmd.data/rd.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/rd.c	(revision 4689)
+++ trunk/Ohana/src/opihi/cmd.data/rd.c	(revision 7080)
@@ -61,6 +61,6 @@
   /* find matrix, free old data */
   if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE);
-  fits_free_matrix (&buf[0].matrix);
-  fits_free_header (&buf[0].header);
+  gfits_free_matrix (&buf[0].matrix);
+  gfits_free_header (&buf[0].header);
 
   /* save file name */
@@ -73,5 +73,5 @@
   if (extend) {
     /* load in appropriate header */
-    Nskip = fits_read_Xheader (argv[2], &buf[0].header, Nextend);
+    Nskip = gfits_read_Xheader (argv[2], &buf[0].header, Nextend);
     if (!Nskip) {
       fprintf (stderr, "entry in %s not found\n", argv[2]);
@@ -113,5 +113,5 @@
     }
     fseek (f, Nskip, SEEK_SET);
-    status = fits_load_matrix (f, &buf[0].matrix, &buf[0].header);
+    status = gfits_load_matrix (f, &buf[0].matrix, &buf[0].header);
     fclose (f);
   } 
@@ -128,5 +128,5 @@
     done = FALSE;
     for (i = 0; !done; i++) {
-      Nskip = fits_read_Xheader (argv[2], &buf[0].header, i);
+      Nskip = gfits_read_Xheader (argv[2], &buf[0].header, i);
       if (!Nskip) {
 	fprintf (stderr, "extension %s in %s not found\n", ccdid, argv[2]);
@@ -135,5 +135,5 @@
 	return (FALSE);
       }
-      if (!fits_scan (&buf[0].header, CCDKeyword, "%s", 1, ID)) {
+      if (!gfits_scan (&buf[0].header, CCDKeyword, "%s", 1, ID)) {
 	fprintf (stderr, "%s not in header\n", CCDKeyword);
 	DeleteBuffer (buf);
@@ -145,5 +145,5 @@
       done = strnumcmp (ccdid, ID);
 
-      if (!done) fits_free_header (&buf[0].header);
+      if (!done) gfits_free_header (&buf[0].header);
     }
     free (CCDKeyword);
@@ -182,10 +182,10 @@
     }
     fseek (f, Nskip, SEEK_SET);
-    status = fits_load_matrix (f, &buf[0].matrix, &buf[0].header);
+    status = gfits_load_matrix (f, &buf[0].matrix, &buf[0].header);
     fclose (f);
   }
 
   if (!ccdsel && !extend) {
-    status = fits_read_header (argv[2], &buf[0].header);
+    status = gfits_read_header (argv[2], &buf[0].header);
     if (JustHead) {
       buf[0].header.Naxes = 0;
@@ -209,9 +209,9 @@
       buf[0].header.Naxis[2] = 0;
       buf[0].header.Naxes = 2;
-      fits_modify (&buf[0].header, "NAXIS", "%d", 1, 2);
-      fits_delete (&buf[0].header, "NAXIS3", 1);
+      gfits_modify (&buf[0].header, "NAXIS", "%d", 1, 2);
+      gfits_delete (&buf[0].header, "NAXIS3", 1);
     }
     sprintf (region, "-1 -1 -1 -1 %d %d", (plane - 1), plane);
-    status = fits_read_segment (argv[2], &buf[0].matrix, region);
+    status = gfits_read_segment (argv[2], &buf[0].matrix, region);
   }
 
@@ -236,5 +236,5 @@
 
   /** now - convert the matrix values to floats for internal use **/
-  fits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
+  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
   
   return (TRUE);