Changeset 39457 for trunk/Ohana/src/relastro/include/relastro.h

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/include/relastro.h (modified) (9 diffs)

trunk/Ohana/src/relastro/include/relastro.h

@@ -88 +88 @@
   off_t *NMEASURE;            // allocated Measures per catalog
   int   *index;               // lookup table catID -> catalog[i]
-  int   *catIDs;              // lookup table catID <- catalog[i]
-  int    maxID;               // max catID value to date
+  unsigned int *catIDs;       // lookup table catID <- catalog[i]
+  unsigned int  maxID;        // max catID value to date
 } CatalogSplitter;
 
@@ -259 +259 @@
 int    REGION_HOST_ID;
 int    PARALLEL_REGIONS_MANUAL;
+char  *MANUAL_UNIQUER;
 
 int          HOST_ID;
@@ -416 +417 @@
 int SetSignals (void);
 
-void relastro_client_free ();
+void relastro_free (SkyTable *sky, SkyList *skylist);
+void relastro_client_free (SkyTable *sky, SkyList *skylist);
 
 GSCRegion    *find_regions        PROTO((Image *image, off_t Nimage, int *Nregions, GSCRegion *fullregion));
@@ -438 +440 @@
 void          initImageBins       PROTO((Catalog *catalog, int Ncatalog, int FULLINIT));
 void          initImages          PROTO((Image *input, off_t *line_number, off_t N));
+void          freeImages          PROTO(());
 void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog));
 void          initMosaicGrid      PROTO((Image *image, off_t Nimage));
@@ -528 +531 @@
 int UpdateSimple (Catalog *catalog, int Ncatalog);
 int UpdateChips (Catalog *catalog, int Ncatalog, int Nloop);
+int UpdateStacks (Catalog *catalog, int Ncatalog);
 int UpdateMosaic (Catalog *catalog, int Ncatalog);
 int UpdateMeasures (Catalog *catalog, int Ncatalog);
@@ -552 +556 @@
 Mosaic *getmosaics (off_t *N);
 void initMosaics (Image *image, off_t Nimage);
+void freeMosaics ();
 StarData *getMosaicRaw (Catalog *catalog, int Ncatalog, off_t mos, off_t *Nstars);
 StarData *getMosaicRef (Catalog *catalog, int Ncatalog, off_t mos, off_t *Nstars);
@@ -588 +593 @@
 
 int initStarMaps ();
+void freeStarMaps ();
 int updateStarMaps(Catalog *catalog);
 int createStarMapPoints();
@@ -653 +659 @@
 
 int indexCatalogs (Catalog *catalog, int Ncatalog);
-int catID_and_objID_to_seq (int catID, int objID, int *catSeq, off_t *objSeq);
+int catID_and_objID_to_seq (unsigned int catID, unsigned int objID, int *catSeq, off_t *objSeq);
+void freeCatalogIndexes (int Ncatalog);
 
 int markObjects (Catalog *catalog, int Ncatalog);
@@ -682 +689 @@
 AstromOffsetTable *get_astrom_table ();
 void put_astrom_table (AstromOffsetTable *myTable);
+void free_astrom_table ();
 
 int fit_map (AstromOffsetMap *map, StarData *raw, StarData *ref, int Npts);