Index: trunk/Ohana/src/opihi/cmd.data/rotate.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/rotate.c	(revision 2843)
+++ trunk/Ohana/src/opihi/cmd.data/rotate.c	(revision 7080)
@@ -41,8 +41,8 @@
     buf[0].header.Naxis[0] = NY;
     buf[0].header.Naxis[1] = NX;
-    fits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
-    fits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
-    fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
-    fits_create_matrix (&buf[0].header, &buf[0].matrix);
+    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
+    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
+    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     out_buff = (float *)buf[0].matrix.buffer;
     for (i = NX - 1; i > -1; i--) {
@@ -52,24 +52,24 @@
     }
     /* fix reference pixel */
-    fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-    fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     X1 = Yo;
     Y1 = NX - Xo;
-    fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-    fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
-    
-    /* fix rotate matrix */
-    fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-    fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-    fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-    fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+    
+    /* fix rotate matrix */
+    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     PC11 = pc21;
     PC12 = pc22;
     PC21 = -pc11;
     PC22 = -pc12;
-    fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-    fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-    fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-    fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
     free (in_buff);
@@ -80,8 +80,8 @@
     buf[0].header.Naxis[0] = NY;
     buf[0].header.Naxis[1] = NX;
-    fits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
-    fits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
-    fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
-    fits_create_matrix (&buf[0].header, &buf[0].matrix);
+    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
+    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
+    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     out_buff = (float *)buf[0].matrix.buffer;
     for (i = 0; i < NX; i++) {
@@ -91,17 +91,17 @@
     }
     /* fix reference pixel */
-    fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-    fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     X1 = NY - Yo;
     Y1 = Xo;
     fprintf (stderr, "%f %f -> %f %f\n", Xo, Yo, X1, Y1);
-    fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-    fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
-    
-    /* fix rotate matrix */
-    fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-    fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-    fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-    fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+    
+    /* fix rotate matrix */
+    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     PC11 = -pc21;
     PC12 = -pc22;
@@ -110,8 +110,8 @@
     fprintf (stderr, "%f %f  ->  %f %f\n", pc11, pc12, PC11, PC12);
     fprintf (stderr, "%f %f  ->  %f %f\n", pc21, pc22, PC21, PC22);
-    fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-    fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-    fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-    fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
     free (in_buff);
@@ -120,6 +120,6 @@
 
   if (!strcasecmp (argv[2], "UPSIDE") || (atof (argv[2]) == -180) || (atof (argv[2]) == 180)) {
-    fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
-    fits_create_matrix (&buf[0].header, &buf[0].matrix);
+    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     out_buff = (float *)buf[0].matrix.buffer;
     for (j = NY - 1; j > -1; j--) {
@@ -129,24 +129,24 @@
     }
     /* fix reference pixel */
-    fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-    fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     X1 = NX - Xo;
     Y1 = NY - Yo;
-    fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-    fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
-    
-    /* fix rotate matrix */
-    fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-    fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-    fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-    fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+    
+    /* fix rotate matrix */
+    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     PC11 = -pc11;
     PC12 = -pc12;
     PC21 = -pc21;
     PC22 = -pc22;
-    fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-    fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-    fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-    fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
     free (in_buff);
@@ -155,6 +155,6 @@
 
   if (!strcasecmp (argv[2], "FLIPY")) {
-    fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
-    fits_create_matrix (&buf[0].header, &buf[0].matrix);
+    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     out_buff = (float *)buf[0].matrix.buffer;
     for (j = NY - 1; j > -1; j--) {
@@ -164,24 +164,24 @@
     }
     /* fix reference pixel */
-    fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-    fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     X1 = Xo;
     Y1 = NY - Yo;
-    fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-    fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
-    
-    /* fix rotate matrix */
-    fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-    fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-    fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-    fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+    
+    /* fix rotate matrix */
+    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     PC11 = pc11;
     PC12 = -pc12;
     PC21 = pc21;
     PC22 = -pc22;
-    fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-    fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-    fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-    fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
     free (in_buff);
@@ -190,6 +190,6 @@
 
   if (!strcasecmp (argv[2], "FLIPX")) {
-    fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
-    fits_create_matrix (&buf[0].header, &buf[0].matrix);
+    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     out_buff = (float *)buf[0].matrix.buffer;
     for (j = 0; j < NY; j++) {
@@ -199,24 +199,24 @@
     }
     /* fix reference pixel */
-    fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-    fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     X1 = NX - Xo;
     Y1 = Yo;
-    fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-    fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
-    
-    /* fix rotate matrix */
-    fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-    fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-    fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-    fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+    
+    /* fix rotate matrix */
+    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     PC11 = -pc11;
     PC12 = pc12;
     PC21 = -pc21;
     PC22 = pc22;
-    fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-    fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-    fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-    fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
     free (in_buff);
@@ -242,6 +242,6 @@
 
   /* fix reference pixel */
-  fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
-  fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
+  gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
+  gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
   /*
   X1 = (Xo - dX)*CosAngle - (Yo - dY)*SinAngle;
@@ -250,27 +250,27 @@
   X1 = Xo*CosAngle - Yo*SinAngle + dX;
   Y1 =  Xo*SinAngle + Yo*CosAngle + dY;
-  fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
-  fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
+  gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
+  gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
 
   /* fix rotate matrix */
-  fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
-  fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
-  fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
-  fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
+  gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
+  gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
+  gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
+  gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
   PC11 = pc11*CosAngle - pc21*SinAngle;
   PC12 = pc12*CosAngle - pc22*SinAngle;
   PC21 = pc21*CosAngle + pc11*SinAngle;
   PC22 = pc22*CosAngle + pc12*SinAngle;
-  fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
-  fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
-  fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
-  fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
+  gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
+  gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
+  gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
+  gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
 
   buf[0].header.Naxis[0] = Lx;
   buf[0].header.Naxis[1] = Ly;
-  fits_modify (&buf[0].header, "NAXIS1", "%d", 1, Lx);
-  fits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
-  fits_create_matrix (&buf[0].header, &buf[0].matrix);
-  fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
+  gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, Lx);
+  gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
+  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
+  gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
   out_buff = (float *)buf[0].matrix.buffer;
   for (j = 0; j < Ly; j++) {