Changeset 37008

Timestamp:

Jul 13, 2014, 11:21:41 AM (12 years ago)

Author:

eugene

Message:

deprecate unused internal fields from Catalog

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

@@ -614 +614 @@
   off_t *found_t;
   off_t *foundWarp_t;
-  off_t *image_t;
-  off_t *mosaic_t;
-  float *X_t;
-  float *Y_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
 

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

@@ -486 +486 @@
 
   /* pointers for data manipulation */
-  catalog[0].X_t = NULL;
-  catalog[0].Y_t = NULL;
+  // catalog[0].X_t = NULL;
+  // catalog[0].Y_t = NULL;
+  catalog[0].nOwn_t = NULL;
   catalog[0].found_t = NULL;
-  catalog[0].image_t = NULL;
-  catalog[0].mosaic_t = NULL;
+  // catalog[0].image_t = NULL;
+  // catalog[0].mosaic_t = NULL;
   catalog[0].foundWarp_t = NULL;
 }
@@ -858 +859 @@
     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].X_t)      free (catalog[0].X_t);
+  // if (catalog[0].Y_t)      free (catalog[0].Y_t);
+  if (catalog[0].nOwn_t)      free (catalog[0].nOwn_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].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);
 }