Index: anches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/dvo.update.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/dvo.update.h (revision 27376) +++ (revision ) @@ -1,399 +1,0 @@ -# include -# include -# include - -# ifndef DVO_H -# define DVO_H - -/* - # define ELIXIR 1 - # define PANSTARRS 0 - # define LONEOS 0 -*/ - -/*** named data values (convert all to enums?) ***/ - -/* DVO table modes */ -enum {DVO_MODE_UNDEF, DVO_MODE_RAW, DVO_MODE_MEF, DVO_MODE_SPLIT, DVO_MODE_MYSQL} DVOTableMode; - -/* DVO table formats */ -enum {DVO_FORMAT_UNDEF, DVO_FORMAT_INTERNAL, DVO_FORMAT_ELIXIR, DVO_FORMAT_LONEOS, DVO_FORMAT_PANSTARRS, DVO_FORMAT_PMTEST} DVOTableFormat; - -/* image data modes in RegImage */ -enum {T_UNDEF = -1, T_NONE, T_OBJECT, T_DARK, T_BIAS, T_FLAT, T_MASK, T_FRINGE, T_SCATTER, T_MODES, T_FRINGEPTS, T_ANY, N_TYPE}; -enum {M_UNDEF = -1, M_NONE, M_MEF, M_SPLIT, M_SINGLE, M_CUBE, M_SLICE, M_MODES, N_MODE}; - -typedef enum { - PROJ_NONE, // undefined - PROJ_ZEA, // zenithal - PROJ_ZPL, // zenithal - PROJ_ARC, // zenithal - PROJ_STG, // zenithal - PROJ_SIN, // zenithal - PROJ_TAN, // zenithal - PROJ_DIS, // zenithal (TAN + polyterms) - PROJ_LIN, // cartesian - PROJ_PLY, // cartesian - PROJ_WRP, // cartesian - PROJ_AIT, // pseudocyl - PROJ_GLS, // pseudocyl - PROJ_PAR, // pseudocyl -} OhanaProjections; - -typedef enum { - PROJ_MODE_NONE, - PROJ_MODE_CARTESIAN, - PROJ_MODE_ZENITHAL, - PROJ_MODE_PSEUDOCYL, -} OhanaProjectionModes; - -/* RegImage.flag values */ -# define IMREG_DIST 0x01 /* image distributed, only imregister-3.0 */ - -/* catalog values to be loaded */ -# define LOAD_AVES 0x01 -# define LOAD_MEAS 0x02 -# define LOAD_MISS 0x04 -# define LOAD_SECF 0x08 -# define LOAD_MEAS_META 0x10 - -/* invalid mag value */ -# define NO_MAG 0x7fff -# define NO_ERR 0xff - -/* photometry code types */ -# define PHOT_PRI 0x01 -# define PHOT_SEC 0x02 -# define PHOT_DEP 0x03 -# define PHOT_REF 0x04 -# define PHOT_ALT 0x05 /* never stored, only for look-ups */ - -/* Image.code values. these are codes to note bad images */ -# define ID_IMAGE_NEW 0x0000 /* no nrphot attempted */ -# define ID_IMAGE_NOCAL 0x0001 /* used within nrphot to mean "don't apply fit" */ -# define ID_IMAGE_POOR 0x0002 /* relphot says image is bad */ -# define ID_IMAGE_SKIP 0x0004 /* external information image is bad */ -# define ID_IMAGE_FEW 0x0008 /* currently too few measurements for good value */ - -/* Measure.flags values */ -# define ID_MEAS_NOCAL 0x0001 -# define ID_MEAS_POOR 0x0002 -# define ID_MEAS_SKIP 0x0004 -# define ID_MEAS_AREA 0x0008 -# define BLEND_IMAGE 0x0100 -# define BLEND_CATALOG 0x0200 -# define BLEND_IMAGE_NEIGHBOR 0x1000 -# define ID_MEAS_TRAIL 0x2000 -# define ID_MEAS_GHOST 0x4000 - -/* some subtle distinctions between the blend flags: - BLEND_IMAGE: the star on an image is matched with more - than one star in the catalog (image has worse seeing than catalog) - BLEND_CATALOG: the star in the catalog is matched with more - than one star on the image (image has better seeing than catalog) - CALIBRATED: relative photometry has been performed on this measurement - BLEND_IMAGE_NEIGHBOR: the star on an image is matched with more - than one star in the catalog, but not in the same catalog file. -*/ - -/* Average.code values */ -# define ID_STAR_FEW 0x0001 /* used within relphot: skip star */ -# define ID_STAR_POOR 0x0002 /* used within relphot: skip star */ -# define ID_PROPER 0x0400 /* star with large proper motion */ -# define ID_TRANSIENT 0x1000 /* is this mutually exclusive with USNO? */ -# define ID_VARIABLE 0x2000 /* not currently set? */ -# define ID_ASTEROID 0x2000 /* identified with an asteroid */ -# define ID_BAD_OBJECT 0x4000 /* if all measurements are bad, set this bit */ -# define ID_MOVING 0x8000 -# define ID_ROCK 0xa000 /* 0x8000 + 0x2000 */ -# define ID_GHOST 0xc001 /* 0x8000 + 0x4000 + 0x0001 */ -# define ID_TRAIL 0xc002 /* 0x8000 + 0x4000 + 0x0002 */ -# define ID_BLEED 0xc003 /* 0x8000 + 0x4000 + 0x0003 */ -# define ID_COSMIC 0xc004 /* 0x8000 + 0x4000 + 0x0004 */ - -/*** general dvo structures (internal use only / not IO) ***/ - -/* FITS DB structure */ -typedef struct { - FILE *f; - char *filename; - int dbstate; - int lockstate; - double timeout; - Header header; - Matrix matrix; - Header theader; - FTable ftable; - VTable vtable; - int mode; /* what data storage mode is used for disk file? */ - int format; /* what data format is used for disk file? */ - int virtual; /* is table in ftable or vtable? */ - int swapped; /* is table in internal byte-order? */ -} FITS_DB; - -/* the basic HST GSC layout corresponds to a depth of 3 */ -# define SKY_DEPTH_HST 3 - -/* SkyRegion : better implementation than GSCRegion */ -typedef struct { - int Nregions; - char **filename; - SkyRegion *regions; -} SkyTable; - -typedef struct { - int Nregions; - char **filename; - SkyRegion **regions; -} SkyList; - -# if (0) -/* structure for data on a catalog region */ -typedef struct { - char filename[256]; - double DEC[2], RA[2]; -} GSCRegion; -# endif - -typedef struct { - int Ncode; - int Nsecfilt; - int hashcode[0x10000]; - int hashNsec[0x10000]; - PhotCode *code; -} PhotCodeData; - -/* a catalog contains this data */ -typedef struct Catalog { - char *filename; /* catalog file */ - FILE *f; /* file descriptor */ - Header header; - - /* data in the catalog file */ - Average *average; - Measure *measure; - Missing *missing; - SecFilt *secfilt; - int Naverage, Nmeasure, Nmissing, Nsecfilt; /* current number of each component */ - int Nave_disk, Nmeas_disk, Nmiss_disk; /* number of component on disk */ - int Nmeas_off; /* dist seq of first loaded data value */ - /* note the different counting for Nsecfilt */ - - /* pointers to split data files */ - struct Catalog *measure_catalog; /* measure catalog data (split) */ - struct Catalog *missing_catalog; /* missing catalog data (split) */ - struct Catalog *secfilt_catalog; /* secfilt catalog data (split) */ - - /* extra catalog information */ - int lockmode; - int catmode; /* storage mode (raw, mef, split, mysql) */ - int catformat; /* storage format (elixir, panstarrs, etc) */ - int catflags; /* choices to be loaded */ - int sorted; /* is measure table average-sorted? */ - - /* pointers for data manipulation */ - int *found; - int *image; - int *mosaic; - float *X; - float *Y; - -} Catalog; - -/*** prototypes ***/ - -/* in gfits_db.c */ -int gfits_db_init PROTO((FITS_DB *db)); -int gfits_db_create PROTO((FITS_DB *db)); -int gfits_db_lock PROTO((FITS_DB *db, char *filename)); -int gfits_db_load PROTO((FITS_DB *db)); -int gfits_db_load_segment PROTO((FITS_DB *db, int start, int Nrows)); -int gfits_db_save PROTO((FITS_DB *db)); -int gfits_db_update PROTO((FITS_DB *db)); -int gfits_db_close PROTO((FITS_DB *db)); -int gfits_db_free PROTO((FITS_DB *db)); - -/* in coords.c, using libautocode/def/coords.d */ -int XY_to_RD (double *ra, double *dec, double x, double y, Coords *coords); -int RD_to_XY (double *x, double *y, double ra, double dec, Coords *coords); -int fXY_to_RD (float *ra, float *dec, double x, double y, Coords *coords); -int fRD_to_XY (float *x, float *y, double ra, double dec, Coords *coords); -int GetCoords (Coords *coords, Header *header); -int PutCoords (Coords *coords, Header *header); -void RegisterMosaic (Coords *coords); -void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch); - -int FindMosaicForImage (Image *images, int Nimages, int entry); -int FindMosaicForImage_TableSearch (Image *images, int Nimages, int entry); -int FindMosaicForImage_MatchSearch (Image *images, int Nimages, int entry); -int BuildChipMatch (Image *images, int Nimages); -void SetImageCorners (double *X, double *Y, Image *image); - -short int putMi (double value); -double getMi (short int value); -void returnMcal (Image *image, double *c); -void assignMcal (Image *image, double *c, int order); -double applyMcal (Image *image, double x, double y); -double findscatter (double *X, double *Y, double *M, double *dM, int N, double *c, int order); - -PhotCode *GetPhotcodebyName (char *name); -PhotCode *GetPhotcodeEquivbyName (char *name); -PhotCode *GetPhotcodebyCode (int code); -PhotCode *GetPhotcodebyNsec (int Nsec); -PhotCode *GetPhotcodeEquivbyCode (int code); -char *GetPhotcodeNamebyCode (int code); - -float PhotInst (Measure *measure); -float PhotCat (Measure *measure); -float PhotSys (Measure *measure, Average *average, SecFilt *secfilt); -float PhotRel (Measure *measure, Average *average, SecFilt *secfilt); -float PhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt); -float PhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); -float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt); -float PhotdM (PhotCode *code, Average *average, SecFilt *secfilt); - -# if (0) -short iPhotInst (Measure *measure); -short iPhotAbs (Measure *measure); -short iPhotCat (Measure *measure); -short iPhotSys (Measure *measure, Average *average, SecFilt *secfilt); -short iPhotRel (Measure *measure, Average *average, SecFilt *secfilt); -short iPhotCal (Measure *thisone, Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -short iPhotAve (PhotCode *code, Average *average, SecFilt *secfilt); -short iPhotRef (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure); -short iPhotXm (PhotCode *code, Average *average, SecFilt *secfilt); -short iPhotdM (PhotCode *code, Average *average, SecFilt *secfilt); -# endif - -float iPhotColor (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code); -int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color); - -int LoadPhotcodes (char *filename); -int GetPhotcodeCodebyName (char *name); -int GetPhotcodeEquivCodebyName (char *name); -int GetPhotcodeEquivCodebyCode (int code); -int GetPhotcodeNsec (int code); -int GetPhotcodeNsecfilt (void); -void SetZeroPoint (double ZP); -int *GetPhotcodeEquivList (int code, int *nlist); -void ParseColorTerms (char *terms, float *X, int *N); - -int get_image_type (char *name); -char *get_type_name (int type); -int get_image_mode (char *name); -char *get_mode_name (int mode); - -/* these functions refer to the DVO structures defined in the includes above - * they are being replaced with autocode entries (drop when totally autocoded) - */ - -int Fread (void *ptr, int size, int nitems, FILE *f, char *type); -int Fwrite (void *ptr, int size, int nitems, FILE *f, char *type); -int ByteSwap (char *ptr, int size, int nitems, char *type); -int ConvertStruct (char *buffer, int size, int Nbytes, char *type); - -/** dvo_catalog APIs */ -void dvo_catalog_init (Catalog *catalog, int complete); -void dvo_catalog_create (SkyRegion *region, Catalog *catalog); -void dvo_catalog_free (Catalog *catalog); -int dvo_catalog_check (Catalog *catalog, int Nsecfilt, int extend); -int dvo_catalog_lock (Catalog *catalog, int lockmode); -int dvo_catalog_unlock (Catalog *catalog); -int dvo_catalog_load (Catalog *catalog, int VERBOSE); -int dvo_catalog_open (Catalog *catalog, SkyRegion *region, int VERBOSE, char *iomode); -int dvo_catalog_save (Catalog *catalog, char VERBOSE); -int dvo_catalog_update (Catalog *catalog, char VERBOSE); -int dvo_catalog_catformat (char *catformat); -int dvo_catalog_catmode (char *catmode); -void dvo_catalog_test (Catalog *catalog, int halt); - -/* catmode-specific APIs */ -int dvo_catalog_load_raw (Catalog *catalog, int VERBOSE); -int dvo_catalog_save_raw (Catalog *catalog, char VERBOSE); -int dvo_catalog_load_mef (Catalog *catalog, int VERBOSE); -int dvo_catalog_save_mef (Catalog *catalog, char VERBOSE); -int dvo_catalog_load_split (Catalog *catalog, int VERBOSE); -int dvo_catalog_save_split (Catalog *catalog, char VERBOSE); -int dvo_catalog_update_split (Catalog *catalog, char VERBOSE); - -/*** conversion functions / I/O conversions ***/ -Average *ReadRawAverage (FILE *f, int Naverage, int format); -Measure *ReadRawMeasure (FILE *f, int Nmeasure, int format); -SecFilt *ReadRawSecFilt (FILE *f, int Nsecfilt, int format); -int WriteRawAverage (FILE *f, Average *average, int Naverage, int format); -int WriteRawMeasure (FILE *f, Measure *measure, int Nmeasure, int format); -int WriteRawSecFilt (FILE *f, SecFilt *secfilt, int Nsecfilt, int format); - -Average *FtableToAverage (FTable *ftable, int *Naverage, int *format); -Average *AverageLoneosToInternal (AverageLoneos *in, int Nvalues); -Average *AverageElixirToInternal (AverageElixir *in, int Nvalues); -Average *AveragePanstarrsToInternal (AveragePanstarrs *in, int Nvalues); -Average *AveragePMtestToInternal (AveragePMtest *in, int Nvalues); -AverageLoneos *AverageInternalToLoneos (Average *in, int Nvalues); -AverageElixir *AverageInternalToElixir (Average *in, int Nvalues); -AveragePanstarrs *AverageInternalToPanstarrs (Average *in, int Nvalues); -AveragePMtest *AverageInternalToPMtest (Average *in, int Nvalues); - -Measure *FtableToMeasure (FTable *ftable, int *Nmeasure, int *format); -Measure *MeasureLoneosToInternal (MeasureLoneos *in, int Nvalues); -Measure *MeasureElixirToInternal (MeasureElixir *in, int Nvalues); -Measure *MeasurePanstarrsToInternal (MeasurePanstarrs *in, int Nvalues); -MeasureLoneos *MeasureInternalToLoneos (Measure *in, int Nvalues); -MeasureElixir *MeasureInternalToElixir (Measure *in, int Nvalues); -MeasurePanstarrs *MeasureInternalToPanstarrs (Measure *in, int Nvalues); - -SecFilt *FtableToSecFilt (FTable *ftable, int *Nsecfilt, int *format); -SecFilt *SecFiltLoneosToInternal (SecFiltLoneos *in, int Nvalues); -SecFilt *SecFiltElixirToInternal (SecFiltElixir *in, int Nvalues); -SecFilt *SecFiltPanstarrsToInternal (SecFiltPanstarrs *in, int Nvalues); -SecFiltLoneos *SecFiltInternalToLoneos (SecFilt *in, int Nvalues); -SecFiltElixir *SecFiltInternalToElixir (SecFilt *in, int Nvalues); -SecFiltPanstarrs *SecFiltInternalToPanstarrs (SecFilt *in, int Nvalues); - -int AverageToFtable (FTable *ftable, Average *average, int Naverage, int format); -int MeasureToFtable (FTable *ftable, Measure *measure, int Nmeasure, int format); -int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format); - -/*** DVO image db I/O Functions ***/ -int dvo_image_lock (FITS_DB *db, char *filename, double timeout, int lockstate); -int dvo_image_unlock (FITS_DB *db); -int dvo_image_load (FITS_DB *db, int VERBOSE, int FORCE_READ); -int dvo_image_save (FITS_DB *db, int VERBOSE); -int dvo_image_update (FITS_DB *db, int VERBOSE); -int dvo_image_load_raw (FITS_DB *db, int VERBOSE, int FORCE_READ); -int dvo_image_update_raw (FITS_DB *db, int VERBOSE); -int dvo_image_save_raw (FITS_DB *db, int VERBOSE); -int dvo_image_addrows (FITS_DB *db, Image *new, int Nnew); -void dvo_image_create (FITS_DB *db, double ZeroPoint); - -int FtableToImage (FTable *ftable, Header *theader, int *format); -int ImageToFtable (FTable *ftable, Header *theader, int format); -int ImageToVtable (VTable *vtable, Header *theader, int format); -Image *ImageElixirToInternal (ImageElixir *in, int Nvalues); -ImageElixir *ImageInternalToElixir (Image *in, int Nvalues); -Image *ImageLoneosToInternal (ImageLoneos *in, int Nvalues); -ImageLoneos *ImageInternalToLoneos (Image *in, int Nvalues); -Image *ImagePanstarrsToInternal (ImagePanstarrs *in, int Nvalues); -ImagePanstarrs *ImageInternalToPanstarrs (Image *in, int Nvalues); - -/* skyregion APIs */ -int SkyTableSave PROTO((SkyTable *table, char *filename)); -SkyTable *SkyTableLoad PROTO((char *filename, int VERBOSE)); -SkyTable *SkyTableFromGSC PROTO((char *filename, int depth, int VERBOSE)); -SkyTable *SkyTableLoadOptimal PROTO((char *catdir, char *SKYFILE, char *GSCFILE, int depth, int VERBOSE)); -int SkyTableSetDepth PROTO((SkyTable *sky, int depth)); -SkyList *SkyRegionByPoint PROTO((SkyTable *table, int depth, double ra, double dec)); -SkyList *SkyListByPoint PROTO((SkyTable *table, double ra, double dec)); -SkyList *SkyListByRadius PROTO((SkyTable *table, int depth, double RA, double DEC, double radius)); -SkyList *SkyListByPatch PROTO((SkyTable *table, int depth, SkyRegion *patch)); -SkyList *SkyListByName PROTO((SkyTable *table, char *name)); -SkyList *SkyListByImage PROTO((SkyTable *table, int depth, Image *image)); -SkyList *SkyListByBounds PROTO((SkyTable *table, int depth, double Rmin, double Rmax, double Dmin, double Dmax)); -SkyList *SkyListChildrenByBounds PROTO((SkyTable *table, int No, int depth, double Rmin, double Rmax, double Dmin, double Dmax)); -int SkyListFree PROTO((SkyList *list, int ELEMENTS)); -int SkyTableFree PROTO((SkyTable *table)); -int SkyListSetFilenames PROTO((SkyList *list, char *path, char *ext)); -int SkyTableSetFilenames PROTO((SkyTable *sky, char *path, char *ext)); - -# endif Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/elixir_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/elixir_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/elixir_defs.h (revision 27377) @@ -1,11 +1,11 @@ -Image *Image_Elixir_ToInternal (Image_Elixir *in, int Nvalues); -Image_Elixir *ImageInternalTo_Elixir (Image *in, int Nvalues); -Average *Average_Elixir_ToInternal (Average_Elixir *in, int Nvalues, SecFilt **primary); -Average_Elixir *AverageInternalTo_Elixir (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, int Nvalues); -Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, int Nvalues); -SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, int Nvalues); -SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, int Nvalues); +Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues); +Image_Elixir *ImageInternalTo_Elixir (Image *in, off_t Nvalues); +Average *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary); +Average_Elixir *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues); +Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues); +SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues); +SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues); -PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues); -PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues); +PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, off_t Nvalues); +PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/loneos_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/loneos_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/loneos_defs.h (revision 27377) @@ -1,8 +1,8 @@ -Image *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues); -Image_Loneos *ImageInternalTo_Loneos (Image *in, int Nvalues); -Average *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary); -Average_Loneos *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues); -Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, int Nvalues); -SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues); -SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues); +Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues); +Image_Loneos *ImageInternalTo_Loneos (Image *in, off_t Nvalues); +Average *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary); +Average_Loneos *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues); +Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues); +SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues); +SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_0_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_0_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_0_defs.h (revision 27377) @@ -1,8 +1,8 @@ -Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, int Nvalues); -Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, int Nvalues); -Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, int Nvalues, SecFilt **primary); -Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, int Nvalues); -Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, int Nvalues); -SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, int Nvalues); -SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, int Nvalues); +Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues); +Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, off_t Nvalues); +Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary); +Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, off_t Nvalues); +Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, off_t Nvalues); +SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, off_t Nvalues); +SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_1_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_1_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/panstarrs_dev_1_defs.h (revision 27377) @@ -1,8 +1,8 @@ -Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, int Nvalues); -Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, int Nvalues); -Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, int Nvalues, SecFilt **primary); -Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, int Nvalues); -Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, int Nvalues); -SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, int Nvalues); -SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, int Nvalues); +Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues); +Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, off_t Nvalues); +Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary); +Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, off_t Nvalues); +Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, off_t Nvalues); +SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, off_t Nvalues); +SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_1_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_1_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_1_defs.h (revision 27377) @@ -1,11 +1,11 @@ -Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, int Nvalues); -Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, int Nvalues); -Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, int Nvalues, SecFilt **primary); -Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, int Nvalues); -Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, int Nvalues); -SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, int Nvalues); -SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, int Nvalues); +Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues); +Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, off_t Nvalues); +Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary); +Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, off_t Nvalues); +Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, off_t Nvalues); +SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, off_t Nvalues); +SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, off_t Nvalues); -PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, int Nvalues); -PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, int Nvalues); +PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, off_t Nvalues); +PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_2_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_2_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_2_defs.h (revision 27377) @@ -1,11 +1,11 @@ -Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, int Nvalues); -Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, int Nvalues); -Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, int Nvalues, SecFilt **primary); -Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, int Nvalues); -Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, int Nvalues); -SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, int Nvalues); -SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, int Nvalues); +Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues); +Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, off_t Nvalues); +Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary); +Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, off_t Nvalues); +Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, off_t Nvalues); +SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, off_t Nvalues); +SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, off_t Nvalues); -PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, int Nvalues); -PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, int Nvalues); +PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, off_t Nvalues); +PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_3_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_3_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_dev_3_defs.h (revision 27377) @@ -1,5 +1,5 @@ -Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues); -Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues); +Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues); +Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, off_t Nvalues); -PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues); -PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues); +PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, off_t Nvalues); +PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_ref_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_ref_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_ref_defs.h (revision 27377) @@ -1,11 +1,11 @@ -Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, int Nvalues); -Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, int Nvalues); -Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, int Nvalues, SecFilt **primary); -Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, int Nvalues); -Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, int Nvalues); -SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, int Nvalues); -SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, int Nvalues); +Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues); +Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, off_t Nvalues); +Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary); +Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, off_t Nvalues); +Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, off_t Nvalues); +SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, off_t Nvalues); +SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, off_t Nvalues); -PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, int Nvalues); -PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, int Nvalues); +PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, off_t Nvalues); +PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_v1_defs.h =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_v1_defs.h (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/include/ps1_v1_defs.h (revision 27377) @@ -1,11 +1,11 @@ -Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, int Nvalues); -Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, int Nvalues); -Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, int Nvalues, SecFilt **primary); -Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, int Nvalues, SecFilt *primary); -Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, int Nvalues); -Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, int Nvalues); -SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, int Nvalues); -SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, int Nvalues); +Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues); +Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, off_t Nvalues); +Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary); +Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, off_t Nvalues, SecFilt *primary); +Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, off_t Nvalues); +Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, off_t Nvalues); +SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, off_t Nvalues); +SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, off_t Nvalues); -PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, int Nvalues); -PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, int Nvalues); +PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, off_t Nvalues); +PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, off_t Nvalues); Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c (revision 27377) @@ -3,7 +3,7 @@ /* convert PS1_DEV_1 formats to internal formats */ -Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, int Nvalues) { - - int i; +Measure *Measure_PS1_DEV_1_ToInternal (Measure_PS1_DEV_1 *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -61,7 +61,7 @@ } -Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, int Nvalues) { - - int i; +Measure_PS1_DEV_1 *MeasureInternalTo_PS1_DEV_1 (Measure *in, off_t Nvalues) { + + off_t i; Measure_PS1_DEV_1 *out; @@ -108,7 +108,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -148,7 +148,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_PS1_DEV_1 *out; @@ -182,7 +182,7 @@ } -SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, int Nvalues) { - - int i; +SecFilt *SecFilt_PS1_DEV_1_ToInternal (SecFilt_PS1_DEV_1 *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -203,7 +203,7 @@ } -SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, int Nvalues) { - - int i; +SecFilt_PS1_DEV_1 *SecFiltInternalTo_PS1_DEV_1 (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_PS1_DEV_1 *out; @@ -220,7 +220,7 @@ } -Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, int Nvalues) { - - int i; +Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues) { + + off_t i; Image *out; @@ -284,7 +284,7 @@ /* convert internal images to panstarrs-format images */ -Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, int Nvalues) { - - int i; +Image_PS1_DEV_1 *ImageInternalTo_PS1_DEV_1 (Image *in, off_t Nvalues) { + + off_t i; Image_PS1_DEV_1 *out; @@ -342,7 +342,7 @@ } -PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, int Nvalues) { - - int i; +PhotCode *PhotCode_PS1_DEV_1_To_Internal (PhotCode_PS1_DEV_1 *in, off_t Nvalues) { + + off_t i; PhotCode *out; @@ -381,7 +381,7 @@ } -PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, int Nvalues) { - - int i; +PhotCode_PS1_DEV_1 *PhotCode_Internal_To_PS1_DEV_1 (PhotCode *in, off_t Nvalues) { + + off_t i; PhotCode_PS1_DEV_1 *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c (revision 27377) @@ -3,7 +3,7 @@ /* convert PS1_DEV_2 formats to internal formats */ -Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, int Nvalues) { - - int i; +Measure *Measure_PS1_DEV_2_ToInternal (Measure_PS1_DEV_2 *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -58,7 +58,7 @@ } -Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, int Nvalues) { - - int i; +Measure_PS1_DEV_2 *MeasureInternalTo_PS1_DEV_2 (Measure *in, off_t Nvalues) { + + off_t i; Measure_PS1_DEV_2 *out; @@ -104,7 +104,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -142,7 +142,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_PS1_DEV_2 *out; @@ -176,7 +176,7 @@ } -SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, int Nvalues) { - - int i; +SecFilt *SecFilt_PS1_DEV_2_ToInternal (SecFilt_PS1_DEV_2 *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -197,7 +197,7 @@ } -SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, int Nvalues) { - - int i; +SecFilt_PS1_DEV_2 *SecFiltInternalTo_PS1_DEV_2 (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_PS1_DEV_2 *out; @@ -214,7 +214,7 @@ } -Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, int Nvalues) { - - int i; +Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues) { + + off_t i; Image *out; @@ -224,5 +224,5 @@ memcpy (&out[i].coords, &in[i].coords, sizeof(Coords)); - strncpy (out[i].name, in[i].name, 63); // out[121], int[64] + strncpy (out[i].name, in[i].name, 63); // out[121], in[64] out[i].name[63] = 0; // force termination @@ -275,7 +275,7 @@ } -Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, int Nvalues) { - - int i; +Image_PS1_DEV_2 *ImageInternalTo_PS1_DEV_2 (Image *in, off_t Nvalues) { + + off_t i; Image_PS1_DEV_2 *out; @@ -335,7 +335,7 @@ } -PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, int Nvalues) { - - int i; +PhotCode *PhotCode_PS1_DEV_2_To_Internal (PhotCode_PS1_DEV_2 *in, off_t Nvalues) { + + off_t i; PhotCode *out; @@ -372,7 +372,7 @@ } -PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, int Nvalues) { - - int i; +PhotCode_PS1_DEV_2 *PhotCode_Internal_To_PS1_DEV_2 (PhotCode *in, off_t Nvalues) { + + off_t i; PhotCode_PS1_DEV_2 *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c (revision 27377) @@ -5,7 +5,7 @@ // We only provide image and photcode conversion -Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, int Nvalues) { +Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues) { - int i; + off_t i; Image *out; @@ -66,7 +66,7 @@ } -Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, int Nvalues) { +Image_PS1_DEV_3 *ImageInternalTo_PS1_DEV_3 (Image *in, off_t Nvalues) { - int i; + off_t i; Image_PS1_DEV_3 *out; @@ -126,7 +126,7 @@ } -PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, int Nvalues) { +PhotCode *PhotCode_PS1_DEV_3_To_Internal (PhotCode_PS1_DEV_3 *in, off_t Nvalues) { - int i; + off_t i; PhotCode *out; @@ -162,7 +162,7 @@ } -PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, int Nvalues) { +PhotCode_PS1_DEV_3 *PhotCode_Internal_To_PS1_DEV_3 (PhotCode *in, off_t Nvalues) { - int i; + off_t i; PhotCode_PS1_DEV_3 *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c (revision 27377) @@ -3,7 +3,7 @@ /* convert PS1_REF formats to internal formats */ -Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, int Nvalues) { - - int i; +Measure *Measure_PS1_REF_ToInternal (Measure_PS1_REF *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -56,7 +56,7 @@ } -Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, int Nvalues) { - - int i; +Measure_PS1_REF *MeasureInternalTo_PS1_REF (Measure *in, off_t Nvalues) { + + off_t i; Measure_PS1_REF *out; @@ -79,7 +79,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -115,7 +115,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_PS1_REF *out; @@ -138,7 +138,7 @@ } -SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, int Nvalues) { - - int i; +SecFilt *SecFilt_PS1_REF_ToInternal (SecFilt_PS1_REF *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -157,7 +157,7 @@ } -SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, int Nvalues) { - - int i; +SecFilt_PS1_REF *SecFiltInternalTo_PS1_REF (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_PS1_REF *out; @@ -171,7 +171,7 @@ } -Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, int Nvalues) { - - int i; +Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues) { + + off_t i; Image *out; @@ -230,7 +230,7 @@ } -Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, int Nvalues) { - - int i; +Image_PS1_REF *ImageInternalTo_PS1_REF (Image *in, off_t Nvalues) { + + off_t i; Image_PS1_REF *out; @@ -289,7 +289,7 @@ } -PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, int Nvalues) { - - int i; +PhotCode *PhotCode_PS1_REF_To_Internal (PhotCode_PS1_REF *in, off_t Nvalues) { + + off_t i; PhotCode *out; @@ -325,7 +325,7 @@ } -PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, int Nvalues) { - - int i; +PhotCode_PS1_REF *PhotCode_Internal_To_PS1_REF (PhotCode *in, off_t Nvalues) { + + off_t i; PhotCode_PS1_REF *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c (revision 27377) @@ -3,7 +3,7 @@ /* convert PS1_V1 formats to internal formats */ -Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, int Nvalues) { - - int i; +Measure *Measure_PS1_V1_ToInternal (Measure_PS1_V1 *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -56,7 +56,7 @@ } -Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, int Nvalues) { - - int i; +Measure_PS1_V1 *MeasureInternalTo_PS1_V1 (Measure *in, off_t Nvalues) { + + off_t i; Measure_PS1_V1 *out; @@ -111,7 +111,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -147,7 +147,7 @@ // 'primary' is needed to conform with the API for Loneos and Elixir, but is not used -Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_PS1_V1 *out; @@ -182,7 +182,7 @@ } -SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, int Nvalues) { - - int i; +SecFilt *SecFilt_PS1_V1_ToInternal (SecFilt_PS1_V1 *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -201,7 +201,7 @@ } -SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, int Nvalues) { - - int i; +SecFilt_PS1_V1 *SecFiltInternalTo_PS1_V1 (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_PS1_V1 *out; @@ -220,7 +220,7 @@ } -Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, int Nvalues) { - - int i; +Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues) { + + off_t i; Image *out; @@ -279,7 +279,7 @@ } -Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, int Nvalues) { - - int i; +Image_PS1_V1 *ImageInternalTo_PS1_V1 (Image *in, off_t Nvalues) { + + off_t i; Image_PS1_V1 *out; @@ -338,7 +338,7 @@ } -PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, int Nvalues) { - - int i; +PhotCode *PhotCode_PS1_V1_To_Internal (PhotCode_PS1_V1 *in, off_t Nvalues) { + + off_t i; PhotCode *out; @@ -374,7 +374,7 @@ } -PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, int Nvalues) { - - int i; +PhotCode_PS1_V1 *PhotCode_Internal_To_PS1_V1 (PhotCode *in, off_t Nvalues) { + + off_t i; PhotCode_PS1_V1 *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_elixir.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_elixir.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_elixir.c (revision 27377) @@ -2,7 +2,7 @@ /* convert elixir-format measures to internal measures */ -Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, int Nvalues) { - - int i; +Measure *Measure_Elixir_ToInternal (Measure_Elixir *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -69,7 +69,7 @@ /* convert internal measures to elixir-format measures */ -Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, int Nvalues) { - - int i; +Measure_Elixir *MeasureInternalTo_Elixir (Measure *in, off_t Nvalues) { + + off_t i; Measure_Elixir *out; @@ -108,7 +108,7 @@ /* convert elixir-format averages to internal averages */ -Average *Average_Elixir_ToInternal (Average_Elixir *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -159,7 +159,7 @@ /* convert internal averages to elixir-format averages */ -Average_Elixir *AverageInternalTo_Elixir (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_Elixir *AverageInternalTo_Elixir (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_Elixir *out; @@ -189,7 +189,7 @@ /* convert elixir-format secfilts to internal secfilts */ -SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, int Nvalues) { - - int i; +SecFilt *SecFilt_Elixir_ToInternal (SecFilt_Elixir *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -213,7 +213,7 @@ /* convert internal secfilts to elixir-format secfilts */ -SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, int Nvalues) { - - int i; +SecFilt_Elixir *SecFiltInternalTo_Elixir (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_Elixir *out; @@ -231,7 +231,7 @@ /* convert elixir-format images to internal images */ -Image *Image_Elixir_ToInternal (Image_Elixir *in, int Nvalues) { - - int i; +Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues) { + + off_t i; Image *out; @@ -297,7 +297,7 @@ /* convert internal images to elixir-format images */ -Image_Elixir *ImageInternalTo_Elixir (Image *in, int Nvalues) { - - int i; +Image_Elixir *ImageInternalTo_Elixir (Image *in, off_t Nvalues) { + + off_t i; Image_Elixir *out; @@ -355,7 +355,7 @@ } -PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, int Nvalues) { - - int i; +PhotCode *PhotCode_Elixir_To_Internal (PhotCode_Elixir *in, off_t Nvalues) { + + off_t i; PhotCode *out; @@ -395,7 +395,7 @@ } -PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, int Nvalues) { - - int i; +PhotCode_Elixir *PhotCode_Internal_To_Elixir (PhotCode *in, off_t Nvalues) { + + off_t i; PhotCode_Elixir *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_loneos.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_loneos.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_loneos.c (revision 27377) @@ -2,7 +2,7 @@ /* convert loneos-format measures to internal measures */ -Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, int Nvalues) { - - int i; +Measure *Measure_Loneos_ToInternal (Measure_Loneos *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -71,7 +71,7 @@ /* convert internal measures to loneos-format measures */ -Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, int Nvalues) { - - int i; +Measure_Loneos *MeasureInternalTo_Loneos (Measure *in, off_t Nvalues) { + + off_t i; Measure_Loneos *out; @@ -99,7 +99,7 @@ /* convert loneos-format averages to internal averages */ -Average *Average_Loneos_ToInternal (Average_Loneos *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -151,7 +151,7 @@ /* convert internal averages to loneos-format averages */ -Average_Loneos *AverageInternalTo_Loneos (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_Loneos *AverageInternalTo_Loneos (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_Loneos *out; @@ -180,7 +180,7 @@ /* convert loneos-format secfilts to internal secfilts */ -SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, int Nvalues) { - - int i; +SecFilt *SecFilt_Loneos_ToInternal (SecFilt_Loneos *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -206,7 +206,7 @@ /* convert internal secfilts to loneos-format secfilts */ -SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, int Nvalues) { - - int i; +SecFilt_Loneos *SecFiltInternalTo_Loneos (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_Loneos *out; @@ -223,7 +223,7 @@ /* convert loneos-format images to internal images */ -Image *Image_Loneos_ToInternal (Image_Loneos *in, int Nvalues) { - - int i; +Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues) { + + off_t i; Image *out; @@ -290,7 +290,7 @@ /* convert internal images to loneos-format images */ -Image_Loneos *ImageInternalTo_Loneos (Image *in, int Nvalues) { - - int i; +Image_Loneos *ImageInternalTo_Loneos (Image *in, off_t Nvalues) { + + off_t i; Image_Loneos *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c (revision 27377) @@ -2,7 +2,7 @@ /* convert panstarrs-format measures to internal measures */ -Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, int Nvalues) { - - int i; +Measure *Measure_Panstarrs_DEV_0_ToInternal (Measure_Panstarrs_DEV_0 *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -66,7 +66,7 @@ /* convert internal measures to panstarrs-format measures */ -Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, int Nvalues) { - - int i; +Measure_Panstarrs_DEV_0 *MeasureInternalTo_Panstarrs_DEV_0 (Measure *in, off_t Nvalues) { + + off_t i; Measure_Panstarrs_DEV_0 *out; @@ -115,7 +115,7 @@ /* convert panstarrs-format averages to internal averages */ // 'primary is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -156,7 +156,7 @@ /* convert internal averages to panstarrs-format averages */ // 'primary is needed to conform with the API for Loneos and Elixir, but is not used -Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_Panstarrs_DEV_0 *out; @@ -191,7 +191,7 @@ /* convert panstarrs-format secfilts to internal secfilts */ -SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, int Nvalues) { - - int i; +SecFilt *SecFilt_Panstarrs_DEV_0_ToInternal (SecFilt_Panstarrs_DEV_0 *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -213,7 +213,7 @@ /* convert internal secfilts to panstarrs-format secfilts */ -SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, int Nvalues) { - - int i; +SecFilt_Panstarrs_DEV_0 *SecFiltInternalTo_Panstarrs_DEV_0 (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_Panstarrs_DEV_0 *out; @@ -231,7 +231,7 @@ /* convert panstarrs-format images to internal images */ -Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, int Nvalues) { - - int i; +Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues) { + + off_t i; Image *out; @@ -297,7 +297,7 @@ /* convert internal images to panstarrs-format images */ -Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, int Nvalues) { - - int i; +Image_Panstarrs_DEV_0 *ImageInternalTo_Panstarrs_DEV_0 (Image *in, off_t Nvalues) { + + off_t i; Image_Panstarrs_DEV_0 *out; Index: /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c =================================================================== --- /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c (revision 27376) +++ /branches/eam_branches/largefiles.20100314/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c (revision 27377) @@ -2,7 +2,7 @@ /* convert panstarrs-format measures to internal measures */ -Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, int Nvalues) { - - int i; +Measure *Measure_Panstarrs_DEV_1_ToInternal (Measure_Panstarrs_DEV_1 *in, off_t Nvalues) { + + off_t i; Measure *out; @@ -66,7 +66,7 @@ /* convert internal measures to panstarrs-format measures */ -Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, int Nvalues) { - - int i; +Measure_Panstarrs_DEV_1 *MeasureInternalTo_Panstarrs_DEV_1 (Measure *in, off_t Nvalues) { + + off_t i; Measure_Panstarrs_DEV_1 *out; @@ -115,7 +115,7 @@ /* convert panstarrs-format averages to internal averages */ // 'primary is needed to conform with the API for Loneos and Elixir, but is not used -Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, int Nvalues, SecFilt **primary) { - - int i; +Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary) { + + off_t i; Average *out; @@ -156,7 +156,7 @@ /* convert internal averages to panstarrs-format averages */ // 'primary is needed to conform with the API for Loneos and Elixir, but is not used -Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, int Nvalues, SecFilt *primary) { - - int i; +Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) { + + off_t i; Average_Panstarrs_DEV_1 *out; @@ -191,7 +191,7 @@ /* convert panstarrs-format secfilts to internal secfilts */ -SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, int Nvalues) { - - int i; +SecFilt *SecFilt_Panstarrs_DEV_1_ToInternal (SecFilt_Panstarrs_DEV_1 *in, off_t Nvalues) { + + off_t i; SecFilt *out; @@ -213,7 +213,7 @@ /* convert internal secfilts to panstarrs-format secfilts */ -SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, int Nvalues) { - - int i; +SecFilt_Panstarrs_DEV_1 *SecFiltInternalTo_Panstarrs_DEV_1 (SecFilt *in, off_t Nvalues) { + + off_t i; SecFilt_Panstarrs_DEV_1 *out; @@ -231,7 +231,7 @@ /* convert panstarrs-format images to internal images */ -Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, int Nvalues) { - - int i; +Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues) { + + off_t i; Image *out; @@ -297,7 +297,7 @@ /* convert internal images to panstarrs-format images */ -Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, int Nvalues) { - - int i; +Image_Panstarrs_DEV_1 *ImageInternalTo_Panstarrs_DEV_1 (Image *in, off_t Nvalues) { + + off_t i; Image_Panstarrs_DEV_1 *out;