Changeset 32251

Timestamp:

Aug 31, 2011, 1:28:42 PM (15 years ago)

Author:

bills

Message:

add psFitsTableNew.h to pslib.h Fix a memory leak.

Location:

trunk/psLib/src

Files:

• fits/psFitsTableNew.c (modified) (4 diffs)
• pslib_strict.h (modified) (1 diff)

trunk/psLib/src/fits/psFitsTableNew.c

@@ -94 +94 @@
 }
 
-void breakhere()
-{
-}
-
 void
 freeTable(psFitsTable *table) {
@@ -103 +99 @@
         psFitsTableColumn *column = &table->columns[col];
         psFree(column->name);
+        if (column->type == PS_DATA_STRING) {
+            for (int row; row < table->numRows; row++) {
+                psFree(column->data.str);
+            }
+        } else if (column->type == PS_DATA_VECTOR) {
+            for (int row; row < table->numRows; row++) {
+                psFree(column->data.vec);
+            }
+        }
         // all of the members in the data union are pointers so just pick S32
         psFree(column->data.S32);
@@ -192 +197 @@
                     NATIVETYPE *values = (NATIVETYPE *) psAlloc(sizeof(NATIVETYPE) * table->numRows); \
                     int anynul = 0; \
-                    breakhere(); \
                     fits_read_col(fits->fd, FITSTYPE, col, 1, \
                                   1, numRows, NULL, values, &anynul, &status); \
@@ -200 +204 @@
                     psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %li\n", \
                             col, name, typecode, repeat); \
+                    psFree(values); \
                 } else { \
                     column->elementSize = repeat; \

trunk/psLib/src/pslib_strict.h

@@ -41 +41 @@
 #include "psFitsImage.h"
 #include "psFitsTable.h"
+#include "psFitsTableNew.h"
 #include "psFitsFloat.h"
 #include "psFitsFloatFile.h"