Index: /branches/eam_branch_20071015/Ohana/src/libfits/include/gfitsio.h
===================================================================
--- /branches/eam_branch_20071015/Ohana/src/libfits/include/gfitsio.h	(revision 15424)
+++ /branches/eam_branch_20071015/Ohana/src/libfits/include/gfitsio.h	(revision 15425)
@@ -111,5 +111,5 @@
 int     gfits_copy_header              PROTO((Header *in, Header *out)); 
 int     gfits_create_header            PROTO((Header *header)); 
-int     gfits_delete_field             PROTO((Header *header, char *field, int N)); 
+int     gfits_delete                   PROTO((Header *header, char *field, int N)); 
 int     gfits_fread_Xheader            PROTO((FILE *f, Header *header, int N));
 int     gfits_fread_header             PROTO((FILE *f, Header *header));
@@ -155,5 +155,5 @@
 void   	gfits_set_matrix_value         PROTO((Matrix *matrix, int x, int y, double value)); 
 int     gfits_write_matrix             PROTO((char *filename, Matrix *matrix)); 
-Matrix *gfits_uncompress_image 	       PROTO((Header *header, FTable *ftable, int primary));
+int     gfits_uncompress_image 	       PROTO((Header *header, Matrix *matrix, FTable *ftable, int primary));
 int     gfits_uncompress_data  	       PROTO((char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout));
 int     gfits_distribute_data  	       PROTO((Matrix *matrix, int bitpix, char *data, int Ndata, int *otile, int *ztile, float zscale, float zzero));
Index: /branches/eam_branch_20071015/Ohana/src/libfits/matrix/F_compress_M.c
===================================================================
--- /branches/eam_branch_20071015/Ohana/src/libfits/matrix/F_compress_M.c	(revision 15424)
+++ /branches/eam_branch_20071015/Ohana/src/libfits/matrix/F_compress_M.c	(revision 15425)
@@ -5,10 +5,10 @@
 # define MOD_KEYWORD(NAME,ZNAME,TYPE,IN,OUT) { \
   gfits_scan (header, ZNAME, TYPE, 1, IN); \
-  gfits_delete_field (header, ZNAME, 1); \
+  gfits_delete (header, ZNAME, 1); \
   gfits_print (header, NAME, TYPE, 1, OUT); }
 
 # define MOD_KEYWORD_REQUIRED(NAME,ZNAME,TYPE,IN,OUT) { \
   if (!gfits_scan (header, ZNAME, TYPE, 1, IN)) ESCAPE; \
-  gfits_delete_field (header, ZNAME, 1); \
+  gfits_delete (header, ZNAME, 1); \
   gfits_print (header, NAME, TYPE, 1, OUT); }
 
@@ -26,9 +26,9 @@
   if (otile != NULL) free (otile); \
   if (ntile != NULL) free (ntile); \
-  return (NULL); }
+  return (FALSE); }
 
 int gfits_uncompress_image (Header *header, Matrix *matrix, FTable *ftable, int primary) {
 
-  int i, j, status, zimage, zcol, Ncur, Nzrows, Nout, Nzdata;
+  int i, j, status, zimage, zcol, Nzrows, Nout, Nzdata;
   char cmptype[80];
   char zaxis[10], naxis[10], key[10], word[81], exttype[81], checksum[81], datasum[81];
@@ -53,5 +53,5 @@
   // extract compression-specific keywords, update header as needed.
   if (!gfits_scan (header, "ZCMPTYPE", "%s", 1, cmptype)) ESCAPE;
-  gfits_delete_field (header, "ZCMPTYPE", 1);
+  gfits_delete (header, "ZCMPTYPE", 1);
 
   MOD_KEYWORD_REQUIRED ("ZBITPIX", "BITPIX", "%d", &header->bitpix, header->bitpix);
@@ -75,5 +75,5 @@
       snprintf (key, 10, "ZTILE%d", i + 1);
       if (!gfits_scan (header, key, "%d", 1, &ztile[i])) ESCAPE;
-      gfits_delete_field (header, key, 1);
+      gfits_delete (header, key, 1);
     }
   }
@@ -86,10 +86,10 @@
     snprintf (key, 10, "ZNAME%d", Noptions + 1);
     if (!gfits_scan (header, key, "%s", 1, word)) break;
-    gfits_delete_field (header, key, 1);
+    gfits_delete (header, key, 1);
     optname[Noptions] = strcreate (word);
 
     snprintf (key, 10, "ZVAL%d", Noptions + 1);
     if (!gfits_scan (header, key, "%s", 1, word)) ESCAPE;
-    gfits_delete_field (header, key, 1);
+    gfits_delete (header, key, 1);
     optvalue[Noptions] = strcreate (word);
 
@@ -108,5 +108,5 @@
     // XXX SIMPLE & XTENSION need to be set on the first line
     if (!gfits_scan (header, "ZSIMPLE", "%t", 1, &header->simple)) ESCAPE;
-    gfits_delete_field (header, "ZSIMPLE", 1);
+    gfits_delete (header, "ZSIMPLE", 1);
     gfits_extended_to_primary (header, header->simple, "Image data");
 
@@ -116,5 +116,5 @@
     // XXX XTENSION needs to be set on the first line
     if (!gfits_scan (header, "ZTENSION", "%s", 1, exttype)) ESCAPE;
-    gfits_delete_field (header, "ZTENSION", 1);
+    gfits_delete (header, "ZTENSION", 1);
     gfits_modify_extended (header, exttype, "Image extension");