Changeset 37807 for trunk/Ohana/src/libfits/include/gfitsio.h

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/include/gfitsio.h (modified) (3 diffs)

trunk/Ohana/src/libfits/include/gfitsio.h

@@ -17 +17 @@
 # define NEWLINE                 10  /* UNIX RETURN character */
 # endif /* NEWLINE */
+
+/* gfits_bintable_format returns 'byte' as the type associated with one-byte logical (non-char) values */
+typedef char byte;
 
 /********** FITS Constants *********/
@@ -116 +119 @@
 int     gfits_modify_alt               PROTO((Header *header, char *field, char *mode, int N,...)); 
 int     gfits_print_alt                PROTO((Header *header, char *field, char *mode, int N,...)); 
+int     gfits_find_Xheader             PROTO((FILE *f, Header *header, char *extname));
 int     gfits_read_Xheader             PROTO((char *filename, Header *header, int N));
 int     gfits_read_header              PROTO((char *filename, Header *header));
@@ -184 +188 @@
 int     gfits_fread_ftable             PROTO((FILE *f, FTable *ftable, char *extname)); 
 int     gfits_fread_ftable_data        PROTO((FILE *f, FTable *ftable, int padIfShort));
-int     gfits_fread_ftable_range       PROTO((FILE *f, FTable *ftable, off_t start, off_t Nrows));
+int     gfits_fread_ftable_range       PROTO((FILE *f, int padIfShort, FTable *ftable, off_t start, off_t Nrows));
 int     gfits_fread_vtable             PROTO((FILE *f, VTable *vtable, char *extname, off_t Nrow, off_t *row));
 int     gfits_fread_vtable_range       PROTO((FILE *f, VTable *vtable, off_t start, off_t Nrows));