IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 21, 2011, 6:45:51 PM (15 years ago)
Author:
eugene
Message:

merge from trunk

Location:
branches/eam_branches/ipp-20110505/Ohana/src/opihi
Files:
19 deleted
33 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.astro/Makefile

    r30972 r31657  
    2525$(SRC)/cplot.$(ARCH).o             \
    2626$(SRC)/csystem.$(ARCH).o           \
    27 $(SRC)/coord_systems.$(ARCH).o     \
    2827$(SRC)/ctimes.$(ARCH).o    \
    2928$(SRC)/cval.$(ARCH).o              \
    … …  
    7776$(INC)/shell.h \
    7877$(INC)/dvomath.h \
    79 $(INC)/convert.h \
    8078$(INC)/display.h
    8179

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.basic/Makefile

    r27255 r31657  
    6666$(INC)/shell.h \
    6767$(INC)/dvomath.h \
    68 $(INC)/convert.h \
    6968$(INC)/display.h
    7069

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/Makefile

    r31450 r31657  
    155155$(INC)/shell.h \
    156156$(INC)/dvomath.h \
    157 $(INC)/convert.h \
    158157$(INC)/display.h
    159158

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/cursor.c

    r13479 r31657  
    2020    remove_argument (N, &argc, argv);
    2121  }
    22   if (!GetGraphData (NULL, &kapa, name)) return (FALSE);
     22  if (!GetGraphdata (NULL, &kapa, name)) return (FALSE);
    2323  FREE (name);
    2424

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/cmd.data/ps.c

    r14590 r31657  
    5656
    5757  // get the connection to kapa, false if none available
    58   if (!GetGraphData (NULL, &kapa, name)) return (FALSE);
     58  if (!GetGraphdata (NULL, &kapa, name)) return (FALSE);
    5959  FREE (name);
    6060

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/Makefile

    r31450 r31657  
    2020funcs = \
    2121$(SRC)/init.$(ARCH).o                   \
    22 $(SRC)/ImageOps.$(ARCH).o               \
    23 $(SRC)/ImageSelection.$(ARCH).o         \
    24 $(SRC)/LoadImages.$(ARCH).o             \
    2522$(SRC)/cmpReadFile.$(ARCH).o            \
    2623$(SRC)/compare.$(ARCH).o                \
    27 $(SRC)/match_image.$(ARCH).o            \
    2824$(SRC)/dvomisc.$(ARCH).o                \
    2925$(SRC)/region_list.$(ARCH).o            \
    3026$(SRC)/find_matches.$(ARCH).o           \
    3127$(SRC)/photometry.$(ARCH).o             \
    32 $(SRC)/dbBooleanCond.$(ARCH).o          \
    33 $(SRC)/dbCheckStack.$(ARCH).o           \
    34 $(SRC)/dbCmdlineFields.$(ARCH).o        \
    35 $(SRC)/dbExtractAverages.$(ARCH).o      \
    36 $(SRC)/dbExtractMeasures.$(ARCH).o      \
    37 $(SRC)/dbExtractImages.$(ARCH).o        \
    38 $(SRC)/dbFields.$(ARCH).o               \
    39 $(SRC)/dbRPN.$(ARCH).o                  \
    40 $(SRC)/dbStackMath.$(ARCH).o            \
    41 $(SRC)/dbStackOps.$(ARCH).o             \
    4228$(SRC)/dvo.$(ARCH).o
    4329

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/badimages.c

    r29540 r31657  
    2020  }
    2121 
    22   image = LoadImages (&Nimage);
     22  image = LoadImagesDVO (&Nimage);
    2323
    2424  Cross = FALSE;
    … …  
    7070  }
    7171 
    72   FreeImages(image);
     72  FreeImagesDVO(image);
    7373  return (TRUE);
    7474}

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/dmt.c

    r27435 r31657  
    4545  }
    4646
    47   if (!GetGraphData (&graphsky, &kapa, NULL)) return (FALSE);
     47  if (!GetGraphdata (&graphsky, &kapa, NULL)) return (FALSE);
    4848  if (!GetGraph (&graphmode, NULL, NULL)) return (FALSE);
    4949

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/extract.c

    r17201 r31657  
    3131  RegionFile *regions;
    3232
    33   if (!GetGraphData (&graphmode, NULL, NULL)) return (FALSE);
     33  if (!GetGraphdata (&graphmode, NULL, NULL)) return (FALSE);
    3434  if (!InitPhotcodes ()) return (FALSE);
    3535

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/gimages.c

    r30612 r31657  
    8383  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
    8484
    85   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     85  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8686  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    8787  BuildChipMatch (image, Nimage);
    … …  
    245245  set_int_variable ("IMAGEphotcode:n", Nfound);
    246246
    247   FreeImages (image);
     247  FreeImagesDVO (image);
    248248  free (subset);
    249249

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/images.c

    r30612 r31657  
    130130 
    131131  /* it is not an error for the database not to have any images */
    132   if ((image = LoadImages (&Nimage)) == NULL) return (TRUE);
     132  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (TRUE);
    133133  BuildChipMatch (image, Nimage);
    134134
    … …  
    355355  free (Xvec.elements.Flt);
    356356  free (Yvec.elements.Flt);
    357   FreeImages (image);
     357  FreeImagesDVO (image);
    358358  FREE (foundMosaic);
    359359  return (TRUE);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imdata.c

    r29540 r31657  
    8686  if ((vec = SelectVector (argv[1], ANYVECTOR, TRUE)) == NULL) return (FALSE);
    8787
    88   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     88  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8989  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    9090  BuildChipMatch (image, Nimage);
    … …  
    222222  vec[0].Nelements = N;
    223223  REALLOCATE (vec[0].elements.Flt, opihi_flt, MAX(1,N));
    224   FreeImages(image);
     224  FreeImagesDVO(image);
    225225  return (TRUE);
    226226}

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imdense.c

    r28958 r31657  
    2121  }
    2222
    23   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     23  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    2424  BuildChipMatch (image, Nimage);
    2525
    … …  
    7070  free (Xvec.elements.Flt);
    7171  free (Yvec.elements.Flt);
    72   FreeImages (image);
     72  FreeImagesDVO (image);
    7373  return (TRUE);
    7474

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imextract.c

    r31160 r31657  
    9090  }
    9191
    92   if ((image = LoadImages (&Nimage)) == NULL) goto escape;
     92  if ((image = LoadImagesDVO (&Nimage)) == NULL) goto escape;
    9393  BuildChipMatch (image, Nimage);
    9494  dbExtractImagesInit ();
    … …  
    141141
    142142  // free (subset);
    143   FreeImages (image);
     143  FreeImagesDVO (image);
    144144
    145145  if (vec) free (vec);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imlist.c

    r29938 r31657  
    8181  }
    8282 
    83   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     83  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    8484  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
    8585  BuildChipMatch (image, Nimage);
    … …  
    108108  }
    109109
    110   FreeImages(image);
     110  FreeImagesDVO(image);
    111111  free (subset);
    112112  return (TRUE);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imphot.c

    r30612 r31657  
    5050  gprint (GP_ERR, "searching in range %ds - %ds (%f seconds)\n", (int)tzero, (int)(tzero + trange), trange);
    5151 
    52   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     52  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    5353  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TRUE);
    5454
    … …  
    9898  }
    9999
    100   FreeImages(image);
     100  FreeImagesDVO(image);
    101101  free (subset);
    102102  return (TRUE);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/imstats.c

    r29540 r31657  
    3030  }
    3131
    32   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     32  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    3333  BuildChipMatch (image, Nimage);
    3434
    … …  
    5858  free (Xvec.elements.Flt);
    5959  free (Yvec.elements.Flt);
    60   FreeImages (image);
     60  FreeImagesDVO (image);
    6161  return (TRUE);
    6262}

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/lcat.c

    r14401 r31657  
    1111  SkyList *skylist;
    1212
    13   if (!GetGraphData (&graphmode, NULL, NULL)) return (FALSE);
     13  if (!GetGraphdata (&graphmode, NULL, NULL)) return (FALSE);
    1414
    1515  ShowAll = FALSE;

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/photometry.c

    r30612 r31657  
    11781178      ra  = average[0].R - measure[0].dR / 3600.0;
    11791179      dec = average[0].D - measure[0].dD / 3600.0;
    1180       image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
     1180      image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
    11811181      if (image == NULL) break;
    11821182      RD_to_XY (&x, &y, ra, dec, &image[0].coords);
    … …  
    11911191      ra  = average[0].R - measure[0].dR / 3600.0;
    11921192      dec = average[0].D - measure[0].dD / 3600.0;
    1193       image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
     1193      image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
    11941194      if (image == NULL) break;
    11951195      RD_to_XY (&x, &y, ra, dec, &image[0].coords);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/region_list.c

    r25757 r31657  
    55   information carried back up */
    66
    7 static char *CATDIR  = NULL;
    87static SkyTable *sky = NULL;
    98
    109int SetCATDIR (char *path, int verbose) {
    1110
     11  char *CATDIR  = NULL;
    1212  char *newpath;
    1313  char catdir_config[256];
    … …  
    2424  }
    2525
    26   if (CATDIR != NULL) free (CATDIR);
    27   CATDIR = strcreate (newpath);
     26  CATDIR = newpath;
     27  // save the new value in libdvo
     28  dvo_set_catdir(CATDIR);
    2829
    2930  if (VarConfig ("GSCFILE",  "%s", gscfile) == NULL) gscfile[0] = 0;
    … …  
    5152
    5253char *GetCATDIR () {
     54  char *CATDIR = dvo_get_catdir();
     55
    5356  if (CATDIR == NULL) {
    54     SetCATDIR (NULL, FALSE);
     57    if (SetCATDIR (NULL, FALSE)) {
     58        CATDIR = dvo_get_catdir();
     59    }
    5560  }
    5661  return (CATDIR);
    … …  
    136141  if (selection->name != NULL) {
    137142    char filename[256];
     143    char *CATDIR = dvo_get_catdir();
    138144
    139145    ALLOCATE (skylist, SkyList, 1);
    … …  
    158164    Graphdata graphsky;
    159165
    160     if (!GetGraphData (&graphsky, NULL, NULL)) {
     166    if (!GetGraphdata (&graphsky, NULL, NULL)) {
    161167      gprint (GP_ERR, "region display not available\n");
    162168      return (NULL);
    … …  
    201207  ALLOCATE (skylist[0].filename, char *, NREGIONS);
    202208  skylist[0].ownElements = TRUE; // free these elements when freeing the list
     209
     210  char *CATDIR = dvo_get_catdir();
    203211
    204212  while (fscanf (f, "%s", filename) != EOF) {

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/skycoverage.c

    r31160 r31657  
    186186  PutCoords (&coords, &buf[0].header);
    187187
    188   image = LoadImages(&Nimage);
     188  image = LoadImagesDVO(&Nimage);
    189189  if (image == NULL) {
    190190      return (FALSE);
    … …  
    266266    }
    267267  }
    268   FreeImages(image);
     268  FreeImagesDVO(image);
    269269  return (TRUE);
    270270}

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/skyregion.c

    r27610 r31657  
    11# include "dvoshell.h"
    22
     3#ifdef NO_MOVED_TO_DVO
    34static double RAs = 0.0;
    45static double RAe = 0.0;
    56static double DECs = 0.0;
    67static double DECe = 0.0;
     8#endif
    79
    810// define the sky region for which extractions are limited
    … …  
    1012 
    1113  if (argc == 1) {
     14    double RAs, RAe, DECs, DECe;
     15    get_skyregion(&RAs, &RAe, &DECs, &DECe);
     16
    1217    gprint (GP_ERR, "current skyregion: %f - %f : %f - %f\n", RAs, RAe, DECs, DECe);
    1318    gprint (GP_ERR, "USAGE:  skyregion (min RA) (max RA) (min DEC) (max DEC)\n");
    … …  
    2429  return (TRUE);
    2530}
    26 
     31#ifdef NOT_MOVED_TO_LIBDVO
    2732int get_skyregion (double *Rs, double *Re, double *Ds, double *De) {
    2833
    … …  
    4449  return TRUE;
    4550}
     51#endif
    4652
    4753/* find region which overlaps c at given depth (-1 : populated ) */

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/dvo/subpix.c

    r29540 r31657  
    114114
    115115  /* load all images, extract those touching Ra, Dec */
    116   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
     116  if ((image = LoadImagesDVO (&Nimage)) == NULL) return (FALSE);
    117117  BuildChipMatch (image, Nimage);
    118118
    … …  
    150150  SkyListFree (skylist);
    151151
    152   FreeImages(image);
     152  FreeImagesDVO(image);
    153153  return (TRUE);
    154154}

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/astro.h

    r21153 r31657  
    2727} CoordTransform;
    2828
     29#ifndef MOVED_TO_LIBDVO
    2930typedef enum {COORD_NONE, COORD_CELESTIAL, COORD_GALACTIC, COORD_ECLIPTIC} CoordTransformSystem;
     31#endif
    3032
    3133CoordTransform *InitTransform (CoordTransformSystem input, CoordTransformSystem output);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/data.h

    r29540 r31657  
    44# include "convert.h"
    55# include "display.h"
     6# include "get_graphdata.h"
    67
    78# ifndef DATA_H

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/display.h

    r27435 r31657  
    1111int           PlotVectorPairErrors  PROTO((int kapa, Vector *xVec, Vector *yVec, Vector *dyValues, Graphdata *graphmode));
    1212int           PlotVectorTriplet     PROTO((int kapa, Vector *xVec, Vector *yVec, Vector *zValues, Graphdata *graphmode));
    13 int           GetGraphData          PROTO((Graphdata *data, int *kapa, char *name));
     13// int           GetGraphData          PROTO((Graphdata *data, int *kapa, char *name));
    1414int           GetGraph              PROTO((Graphdata *data, int *kapa, char *name));
    1515int           SetGraph              PROTO((Graphdata *data));

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/dvomath.h

    r20936 r31657  
    77
    88# define NCHARS 256
    9 # define opihi_flt double
    10 # define opihi_int int
     9// # define opihi_flt double
     10// # define opihi_int int
    1111// NOTE: if opihi_int is changed to unsigned, all subtraction and negation operations
    1212// need to result in a float value (or 3 - 5 will yield the unexpected value 2^32 - 2)
    … …  
    2626enum {ANYVECTOR, NEWVECTOR, OLDVECTOR};
    2727enum {ANYBUFFER, NEWBUFFER, OLDBUFFER};
     28#ifdef NOT_MOVED_TO_LIBDVO
    2829enum {OPIHI_FLT, OPIHI_INT};
     30#endif
    2931
    3032typedef struct {                        /* representation of a variable (0-D) */
    … …  
    6466/* math functions */
    6567char         *dvomath               PROTO((int argc, char **argv, int *size, int maxsize));
    66 char        **isolate_elements      PROTO((int argc, char **argv, int *nstack));
     68// MOVED to libohana
     69// char        **isolate_elements      PROTO((int argc, char **argv, int *nstack));
    6770StackVar     *convert_to_RPN        PROTO((int argc, char **argv, int *nstack));
    6871int           check_stack           PROTO((StackVar *stack, int Nstack, int validsize));
    … …  
    144147/* why are these in here? */
    145148int           gfits_copy_matrix_info (Matrix *matrix1, Matrix *matrix2);
     149#ifndef MOVED_TO_LIBDVO
    146150int           GetTimeFormat         PROTO((time_t *TimeReference, int *TimeFormat));
     151#endif
    147152
    148153# endif

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/dvoshell.h

    r31160 r31657  
    22# include "basic.h"
    33# include "astro.h"
     4# include "dvo.h"
    45
    56# ifndef DVOSHELL_H
    67# define DVOSHELL_H
    78
     9#ifdef NOT_MOVED_TO_LIBDVO
    810typedef enum {
    911  DB_STACK_NONE  = 0,
    … …  
    232234};
    233235
    234 
    235236enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
    236237enum {DVO_DB_CMDLINE_ERROR, DVO_DB_CMDLINE_IS_END, DVO_DB_CMDLINE_IS_WHERE, DVO_DB_CMDLINE_IS_MATCH};
    … …  
    268269  opihi_int Int;
    269270} dbValue;
     271
     272#endif // notdef MOVED_TO_LIBDVO
    270273
    271274typedef struct {
    … …  
    313316void          FreeDVO               PROTO((void));
    314317int           InitPhotcodes         PROTO((void));
     318#ifdef NOT_MOVED_TO_DVO
    315319Image        *LoadImages            PROTO((off_t *Nimage));
    316320void          FreeImages            PROTO((Image *images));
    317321Image        *MatchImage            PROTO((unsigned int time, short int source, unsigned int imageID));
     322#endif
    318323Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
    319324int           Quality               PROTO((Measure *measure, int IsDophot));
    … …  
    347352CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
    348353int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
    349 
     354int wordhash (char *word);
     355
     356#ifdef NOT_MOVED_TO_LIBDVO
    350357// dvo DB field functions
    351358dbField     *dbCmdlineFields        PROTO((int argc, char **argv, int table, int *last, int *nfields));
    … …  
    361368dbStack     *dbBinary               PROTO((dbStack *V1, dbStack *V2, char *op, dbValue *fields));
    362369dbStack     *dbUnary                PROTO((dbStack *V1, char *op, dbValue *fields));
     370#endif
    363371
    364372int          GetMagMode             PROTO((char *string));
    … …  
    368376int          ParseImageField        PROTO((dbField *field, char *fieldName));
    369377
    370 dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    371378dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    372379dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
     380#ifdef NOT_MOVED_TO_LIBDVO
     381dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    373382
    374383void         dbInitField            PROTO((dbField *field));
    375384void         dbFreeFields           PROTO((dbField *fields, int Nfields));
    376385int          dbAstroRegionLimits    PROTO((dbStack **stack, int *nstack, SkyRegionSelection *selection, int table));
    377 char        *strfloat               PROTO((float value));
    378 
    379386int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
    380387int set_skyregion (double Rs, double Re, double Ds, double De);
    381388void FreeImageSelection (void);
     389char        *strfloat               PROTO((float value));
     390
    382391
    383392void FreeSkyRegionSelection (SkyRegionSelection *selection);
    384 int wordhash (char *word);
     393
    385394
    386395int dbExtractMeasuresInitTransform (CoordTransformSystem target);
    … …  
    395404int dbExtractImagesInit (void);
    396405int dbExtractImagesReset (void);
     406#endif // NOT_MOVED_TO_LIBDVO
    397407
    398408# endif

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/include/shell.h

    r31590 r31657  
    1212# define MACRO_NAME(s) MACRO_STRING(s)
    1313
     14typedef enum {GP_FILE, GP_BUFF} gpMode;
     15#ifdef NOT_MOVED_TO_LIBOHANA
    1416/* enums used by gprint functions */
    15 typedef enum {GP_FILE, GP_BUFF} gpMode;
    1617typedef enum {GP_LOG, GP_ERR} gpDest;
     18#endif
    1719typedef enum {OPIHI_VERBOSE_OFF, OPIHI_VERBOSE_ON, OPIHI_VERBOSE_ERROR} OpihiVerboseMode;
    1820
    … …  
    122124char         *VarConfigEntry            PROTO((char *keyword, char *mode, int entry, void *ptr));
    123125
     126#ifndef NOT_MOVED_TO_DVO
    124127int           init_error                PROTO((void));
    125128int           push_error                PROTO((char *line));
    126129int           print_error               PROTO((void));
     130#endif
     131
    127132void          handle_interrupt          PROTO((int));
    128133char        **command_completer         PROTO((const char *, int, int));
    … …  
    171176FILE         *gprintGetFile             PROTO((gpDest dest));
    172177char         *gprintGetName             PROTO((gpDest dest));
     178#ifdef NOT_MOVED_TO_LIBOHANA
    173179int           gprint                    PROTO((gpDest dest, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
     180#endif
    174181int           gwrite                    PROTO((char *buffer, int size, int N, gpDest dest));
    175182int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...)) OHANA_FORMAT(printf, 3, 4);

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/lib.data/Makefile

    r29540 r31657  
    2121$(SDIR)/svdcmp.$(ARCH).o                \
    2222$(SDIR)/svdcmp_bond_new.$(ARCH).o               \
    23 $(SDIR)/convert.$(ARCH).o               \
    2423$(SDIR)/bracket.$(ARCH).o               \
    2524$(SDIR)/spline.$(ARCH).o                \
    … …  
    4847$(INC)/shell.h \
    4948$(INC)/dvomath.h \
    50 $(INC)/convert.h \
    5149$(INC)/display.h
    5250

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/lib.data/open_kapa.c

    r18326 r31657  
    162162
    163163/* return pointers for given kapa, don't set or open */
    164 int GetGraphData (Graphdata *data, int *fd, char *name) {
     164int GetGraphdata (Graphdata *data, int *fd, char *name) {
    165165
    166166  int entry;

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/lib.shell/Makefile

    r16889 r31657  
    2828$(SDIR)/convert_to_RPN.$(ARCH).o        \
    2929$(SDIR)/dvomath.$(ARCH).o               \
    30 $(SDIR)/errors.$(ARCH).o                \
    3130$(SDIR)/evaluate_stack.$(ARCH).o        \
    3231$(SDIR)/exec_loop.$(ARCH).o             \
    … …  
    3534$(SDIR)/gprint.$(ARCH).o                \
    3635$(SDIR)/interrupt.$(ARCH).o             \
    37 $(SDIR)/isolate_elements.$(ARCH).o      \
    3836$(SDIR)/macro_create.$(ARCH).o          \
    3937$(SDIR)/macro_delete.$(ARCH).o          \
    … …  
    6159$(INC)/shell.h \
    6260$(INC)/dvomath.h \
    63 $(INC)/convert.h \
    6461$(INC)/display.h
    6562

  • branches/eam_branches/ipp-20110505/Ohana/src/opihi/lib.shell/dvomath.c

    r20936 r31657  
    11# include "opihi.h"
     2# include "dvo.h"
    23
    34/* return value on success is temp vector/buffer name or scalar value return value on error is NULL, all
Note: See TracChangeset for help on using the changeset viewer.