Changeset 37002

Timestamp:

Jul 12, 2014, 8:38:35 AM (12 years ago)

Author:

eugene

Message:

free the found and foundWarp catalog elements (grows too large for whole sky)

Location:

branches/eam_branches/ipp-20140610/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (2 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h

@@ -612 +612 @@
 
   /* pointers for data manipulation */
-  off_t *found;
-  off_t *foundWarp;
-  off_t *image;
-  off_t *mosaic;
-  float *X;
-  float *Y;
-  int   *nOwn; // relastro uses this to count owned detections per object
+  off_t *found_t;
+  off_t *foundWarp_t;
+  off_t *image_t;
+  off_t *mosaic_t;
+  float *X_t;
+  float *Y_t;
+  int   *nOwn_t; // relastro uses this to count owned detections per object
 
 } Catalog;

branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_catalog.c

@@ -485 +485 @@
 
   /* pointers for data manipulation */
-  catalog[0].found = NULL;
-  catalog[0].image = NULL;
-  catalog[0].mosaic = NULL;
-  catalog[0].X = NULL;
-  catalog[0].Y = NULL;
+  catalog[0].X_t = NULL;
+  catalog[0].Y_t = NULL;
+  catalog[0].found_t = NULL;
+  catalog[0].image_t = NULL;
+  catalog[0].mosaic_t = NULL;
+  catalog[0].foundWarp_t = NULL;
 }
 
@@ -856 +857 @@
     catalog[0].lensobj = NULL;
   }
+  if (catalog[0].X_t)         free (catalog[0].X_t);
+  if (catalog[0].Y_t)         free (catalog[0].Y_t);
+  if (catalog[0].found_t)     free (catalog[0].found_t);
+  if (catalog[0].image_t)     free (catalog[0].image_t);
+  if (catalog[0].mosaic_t)    free (catalog[0].mosaic_t);
+  if (catalog[0].foundWarp_t) free (catalog[0].foundWarp_t);
 }