Changeset 35694

Timestamp:

Jun 21, 2013, 3:17:39 PM (13 years ago)

Author:

eugene

Message:

new init functions for matrix and table

Location:

branches/eam_branches/ipp-20130509/Ohana/src/libfits

Files:

• header/F_init_H.c (modified) (1 diff)
• include/gfitsio.h (modified) (2 diffs)
• matrix/F_create_M.c (modified) (1 diff)
• table/F_create_T.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/libfits/header/F_init_H.c

@@ -18 +18 @@
   header[0].Naxes  = 0;
   header[0].buffer = NULL;
-  for (i = 0; i < FT_MAX_NAXES; i++)
-    header[0].Naxis[i] = 0;
+  for (i = 0; i < FT_MAX_NAXES; i++) header[0].Naxis[i] = 0;
+  header[0].datasize = 0;
 
   return (TRUE);

branches/eam_branches/ipp-20130509/Ohana/src/libfits/include/gfitsio.h

@@ -140 +140 @@
 /******************************* Matrix functions *************/
 
+int     gfits_init_matrix              PROTO((Matrix *matrix));
 void    gfits_add_matrix_value         PROTO((Matrix *matrix, off_t x, off_t y, double value)); 
 int     gfits_convert_format           PROTO((Header *header, Matrix *matrix, int outBitpix, double outScale, double outZero, int inBlank, int outUnsign));
@@ -168 +169 @@
 
 /******************************* Table functions *************/
+
+int     gfits_init_table               PROTO((FTable *table));
+int     gfits_init_vtable              PROTO((VTable *table));
 
 char   *gfits_table_print              PROTO((FTable *ftable,...));

branches/eam_branches/ipp-20130509/Ohana/src/libfits/matrix/F_create_M.c

@@ -25 +25 @@
 }
 
+/*********************** fits create matrix *******************************/
+int gfits_init_matrix (Matrix *matrix) {
+
+  int i;
+
+  matrix[0].bitpix = 8;
+  matrix[0].unsign = FALSE;
+  matrix[0].bscale = 1.0;
+  matrix[0].bzero  = 0.0;
+  matrix[0].Naxes  = 0;
+  for (i = 0; i < FT_MAX_NAXES; i++) matrix[0].Naxis[i] = 0;
+
+  matrix[0].buffer = NULL;
+  matrix[0].datasize = 0;
+  return (TRUE);
+
+}
+
 // XXX free buffer if non-null: need to double check for existing frees

branches/eam_branches/ipp-20130509/Ohana/src/libfits/table/F_create_T.c

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
+
+/*********************** fits init table *******************************/
+int gfits_init_table (FTable *table) {
+  table[0].header = NULL;
+  table[0].buffer = NULL;
+  table[0].datasize = 0;
+  table[0].validsize = 0;
+  return (TRUE);
+
+}
+
+/*********************** fits init table *******************************/
+int gfits_init_vtable (VTable *table) {
+
+  table[0].header   = NULL;
+  table[0].buffer   = NULL;
+  table[0].row      = NULL;
+  table[0].Nrow     = 0;
+  table[0].datasize = 0;
+  table[0].pad      = 0;
+  return (TRUE);
+}
 
 /*********************** fits create table *******************************/