IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37004


Ignore:
Timestamp:
Jul 13, 2014, 10:59:29 AM (12 years ago)
Author:
eugene
Message:

add paramsOffset to average.d (for stellar parameters); refColor changed to refColorBlue,refColorRed; stole 4 bytes from image.name for refColorRed; chnaged X,YoffGAL to R,DoffGAL

Location:
branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractAverages.c

    r36908 r37004  
    162162      break;
    163163    case AVE_REF_COLOR:
    164       value.Flt = average[0].refColor;
     164      value.Flt = average[0].refColorBlue;
    165165      break;
    166166

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractImages.c

    r36833 r37004  
    376376
    377377    case IMAGE_REF_COLOR:
    378       value.Flt = image[N].refColor;
     378      value.Flt = image[N].refColorBlue;
    379379      break;
    380380  }

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dbExtractMeasures.c

    r36912 r37004  
    476476
    477477    case MEAS_REF_COLOR:
    478       value.Flt = average[0].refColor;
     478      value.Flt = average[0].refColorBlue;
    479479      break;
    480480

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

    r37002 r37004  
    137137  average->extendOffset    = -1;
    138138
    139   average->refColor        = NAN;
     139  average->refColorBlue    = NAN;
     140  average->refColorRed     = NAN;
    140141
    141142  average->flags           = 0;
    … …  
    253254 measure->XoffDCR   = NAN;
    254255 measure->YoffDCR   = NAN;
    255  measure->XoffGAL   = NAN;
    256  measure->YoffGAL   = NAN;
     256 measure->RoffGAL   = NAN;
     257 measure->DoffGAL   = NAN;
    257258
    258259 measure->Sky       = NAN;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r36975 r37004  
    208208}
    209209
     210# define RAW_IMAGE_NAME_LEN 64
     211
    210212Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues, off_t Nalloc) {
    211213
    … …  
    221223    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    222224
    223     strncpy (out[i].name, in[i].name, 63); // out[128], in[64]
    224     out[i].name[63] = 0; // force termination
     225    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     226    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     227    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    225228
    226229    out[i].tzero            = in[i].tzero;
    … …  
    288291    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    289292
    290     strncpy (out[i].name, in[i].name, 63); // out[128], in[64]
    291     out[i].name[63] = 0; // force termination
     293    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     294    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     295    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    292296
    293297    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r36975 r37004  
    123123    out[i].measureOffset = in[i].measureOffset;
    124124    out[i].missingOffset = in[i].missingOffset;
    125     out[i].refColor  = in[i].refColor;
     125    out[i].refColorBlue  = in[i].refColor;
    126126    out[i].objID         = in[i].objID;
    127127    out[i].catID         = in[i].catID;
    … …  
    157157    out[i].measureOffset = in[i].measureOffset;
    158158    out[i].missingOffset = in[i].missingOffset;
    159     out[i].refColor  = in[i].refColor;
     159    out[i].refColor  = in[i].refColorBlue;
    160160    out[i].objID         = in[i].objID;
    161161    out[i].catID         = in[i].catID;
    … …  
    203203}
    204204
     205# define RAW_IMAGE_NAME_LEN 64
     206
    205207Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues, off_t Nalloc) {
    206208
    … …  
    216218    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    217219
    218     strncpy (out[i].name, in[i].name, 63); // out[121], in[64]
    219     out[i].name[63] = 0; // force termination
     220    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     221    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     222    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    220223
    221224    out[i].tzero            = in[i].tzero;
    … …  
    280283    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    281284
    282     strncpy (out[i].name, in[i].name, 63); // in[121], out[64]
    283     out[i].name[63] = 0; // force termination
     285    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     286    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     287    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    284288
    285289    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r36898 r37004  
    132132}
    133133
     134# define RAW_IMAGE_NAME_LEN 121
     135
    134136Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues, off_t Nalloc) {
    135137
    … …  
    145147    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    146148
    147     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    148     out[i].name[120] = 0; // force termination
     149    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     150    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     151    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    149152
    150153    out[i].tzero            = in[i].tzero;
    … …  
    207210    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    208211
    209     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    210     out[i].name[120] = 0; // force termination
     212    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     213    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     214    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    211215
    212216    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r36975 r37004  
    143143    out[i].measureOffset = in[i].measureOffset;
    144144    out[i].missingOffset = in[i].missingOffset;
    145     out[i].refColor  = in[i].refColor;
     145    out[i].refColorBlue  = in[i].refColor;
    146146    out[i].flags         = in[i].flags;   
    147147    out[i].objID         = in[i].objID;
    … …  
    178178    out[i].measureOffset = in[i].measureOffset;
    179179    out[i].missingOffset = in[i].missingOffset;
    180     out[i].refColor  = in[i].refColor;
     180    out[i].refColor      = in[i].refColorBlue;
    181181    out[i].flags         = in[i].flags;   
    182182    out[i].objID         = in[i].objID;
    … …  
    227227}
    228228
     229# define RAW_IMAGE_NAME_LEN 121
     230
    229231Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues, off_t Nalloc) {
    230232
    … …  
    240242    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    241243
    242     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    243     out[i].name[120] = 0; // force termination
     244    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     245    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     246    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    244247
    245248    out[i].tzero            = in[i].tzero;
    … …  
    303306    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    304307
    305     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    306     out[i].name[120] = 0; // force termination
     308    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     309    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     310    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    307311
    308312    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

    r36975 r37004  
    148148    out[i].measureOffset = in[i].measureOffset;
    149149    out[i].missingOffset = in[i].missingOffset;
    150     out[i].refColor  = in[i].refColor;
     150    out[i].refColorBlue  = in[i].refColor;
    151151    out[i].flags         = in[i].flags;   
    152152    out[i].objID         = in[i].objID;
    … …  
    187187    out[i].measureOffset = in[i].measureOffset;
    188188    out[i].missingOffset = in[i].missingOffset;
    189     out[i].refColor  = in[i].refColor;
     189    out[i].refColor  = in[i].refColorBlue;
    190190    out[i].flags         = in[i].flags;   
    191191    out[i].objID         = in[i].objID;
    … …  
    238238}
    239239
     240# define RAW_IMAGE_NAME_LEN 121
     241
    240242Image *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues, off_t Nalloc) {
    241243
    … …  
    251253    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    252254
    253     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    254     out[i].name[120] = 0; // force termination
     255    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     256    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     257    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    255258
    256259    out[i].tzero            = in[i].tzero;
    … …  
    272275    out[i].DECo             = in[i].DECo;
    273276    out[i].Radius           = in[i].Radius;
    274     out[i].refColor         = in[i].refColor;
     277    out[i].refColorBlue             = in[i].refColor;
    275278
    276279    out[i].detection_limit  = in[i].detection_limit;
    … …  
    314317    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    315318
    316     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    317     out[i].name[120] = 0; // force termination
     319    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     320    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     321    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    318322
    319323    out[i].tzero            = in[i].tzero;
    … …  
    335339    out[i].DECo             = in[i].DECo;
    336340    out[i].Radius           = in[i].Radius;
    337     out[i].refColor         = in[i].refColor;
     341    out[i].refColor         = in[i].refColorBlue;
    338342
    339343    out[i].detection_limit  = in[i].detection_limit;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

    r36975 r37004  
    148148    out[i].measureOffset = in[i].measureOffset;
    149149    out[i].missingOffset = in[i].missingOffset;
    150     out[i].refColor  = in[i].refColor;
     150    out[i].refColorBlue  = in[i].refColor;
    151151    out[i].flags         = in[i].flags;   
    152152    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    189189    out[i].measureOffset = in[i].measureOffset;
    190190    out[i].missingOffset = in[i].missingOffset;
    191     out[i].refColor  = in[i].refColor;
     191    out[i].refColor      = in[i].refColorBlue;
    192192    out[i].flags         = in[i].flags;   
    193193    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    248248}
    249249
     250# define RAW_IMAGE_NAME_LEN 121
     251
    250252Image *Image_PS1_V3_ToInternal (Image_PS1_V3 *in, off_t Nvalues, off_t Nalloc) {
    251253
    … …  
    261263    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    262264
    263     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    264     out[i].name[120] = 0; // force termination
     265    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     266    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     267    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    265268
    266269    out[i].tzero            = in[i].tzero;
    … …  
    282285    out[i].DECo             = in[i].DECo;
    283286    out[i].Radius           = in[i].Radius;
    284     out[i].refColor         = in[i].refColor;
     287    out[i].refColorBlue     = in[i].refColor;
    285288
    286289    out[i].detection_limit  = in[i].detection_limit;
    … …  
    324327    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    325328
    326     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    327     out[i].name[120] = 0; // force termination
     329    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     330    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     331    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    328332
    329333    out[i].tzero            = in[i].tzero;
    … …  
    345349    out[i].DECo             = in[i].DECo;
    346350    out[i].Radius           = in[i].Radius;
    347     out[i].refColor         = in[i].refColor;
     351    out[i].refColor         = in[i].refColorBlue;
    348352
    349353    out[i].detection_limit  = in[i].detection_limit;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r36975 r37004  
    169169    out[i].measureOffset = in[i].measureOffset;
    170170    out[i].missingOffset = in[i].missingOffset;
    171     out[i].refColor      = in[i].refColor;
     171    out[i].refColorBlue  = in[i].refColor;
    172172    out[i].flags         = in[i].flags;   
    173173    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    213213    out[i].measureOffset = in[i].measureOffset;
    214214    out[i].missingOffset = in[i].missingOffset;
    215     out[i].refColor      = in[i].refColor;
     215    out[i].refColor      = in[i].refColorBlue;
    216216    out[i].flags         = in[i].flags;   
    217217    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    286286}
    287287
     288# define RAW_IMAGE_NAME_LEN 121
     289
    288290Image *Image_PS1_V4_ToInternal (Image_PS1_V4 *in, off_t Nvalues, off_t Nalloc) {
    289291
    … …  
    299301    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    300302
    301     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    302     out[i].name[120] = 0; // force termination
     303    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     304    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     305    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    303306
    304307    out[i].tzero            = in[i].tzero;
    … …  
    320323    out[i].DECo             = in[i].DECo;
    321324    out[i].Radius           = in[i].Radius;
    322     out[i].refColor         = in[i].refColor;
     325    out[i].refColorBlue     = in[i].refColor;
    323326
    324327    out[i].detection_limit  = in[i].detection_limit;
    … …  
    362365    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    363366
    364     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    365     out[i].name[120] = 0; // force termination
     367    // RAW_IMAGE_NAME_LEN > DVO_IMAGE_NAME_LEN
     368    strncpy (out[i].name, in[i].name, DVO_IMAGE_NAME_LEN - 1);
     369    out[i].name[DVO_IMAGE_NAME_LEN - 1] = 0; // force termination
    366370
    367371    out[i].tzero            = in[i].tzero;
    … …  
    383387    out[i].DECo             = in[i].DECo;
    384388    out[i].Radius           = in[i].Radius;
    385     out[i].refColor         = in[i].refColor;
     389    out[i].refColor         = in[i].refColorBlue;
    386390
    387391    out[i].detection_limit  = in[i].detection_limit;
    … …  
    686690    out[i].measureOffset = in[i].measureOffset;
    687691    out[i].missingOffset = in[i].missingOffset;
    688     out[i].refColor      = in[i].refColor;
     692    out[i].refColorBlue  = in[i].refColor;
    689693    out[i].flags         = in[i].flags;   
    690694    out[i].photFlagsUpper = in[i].photFlagsUpper;   

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

    r36975 r37004  
    4040    out[i].XoffDCR    = in[i].XoffDCR;
    4141    out[i].YoffDCR    = in[i].YoffDCR;
    42     out[i].XoffGAL    = in[i].XoffGAL;
    43     out[i].YoffGAL    = in[i].YoffGAL;
     42    out[i].RoffGAL    = in[i].RoffGAL;
     43    out[i].DoffGAL    = in[i].DoffGAL;
    4444    out[i].Sky        = in[i].Sky;
    4545    out[i].dSky       = in[i].dSky;
    … …  
    112112    out[i].XoffDCR    = in[i].XoffDCR;
    113113    out[i].YoffDCR    = in[i].YoffDCR;
    114     out[i].XoffGAL    = in[i].XoffGAL;
    115     out[i].YoffGAL    = in[i].YoffGAL;
     114    out[i].RoffGAL    = in[i].RoffGAL;
     115    out[i].DoffGAL    = in[i].DoffGAL;
    116116    out[i].Sky        = in[i].Sky;
    117117    out[i].dSky       = in[i].dSky;
    … …  
    198198    out[i].lensobjOffset = in[i].lensobjOffset;
    199199    out[i].extendOffset  = in[i].extendOffset;
    200 
    201     out[i].refColor      = in[i].refColor;
     200    out[i].paramsOffset  = in[i].paramsOffset;
     201
     202    out[i].refColorBlue  = in[i].refColorBlue;
     203    out[i].refColorRed   = in[i].refColorRed;
     204
    202205    out[i].flags         = in[i].flags;   
    203206    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    258261    out[i].lensobjOffset = in[i].lensobjOffset;
    259262    out[i].extendOffset  = in[i].extendOffset;
    260 
    261     out[i].refColor      = in[i].refColor;
     263    out[i].paramsOffset  = in[i].paramsOffset;
     264
     265    out[i].refColorBlue  = in[i].refColorBlue;
     266    out[i].refColorRed   = in[i].refColorRed;
     267
    262268    out[i].flags         = in[i].flags;   
    263269    out[i].photFlagsUpper = in[i].photFlagsUpper;   
    … …  
    620626}
    621627
     628# define RAW_IMAGE_NAME_LEN 117
     629
    622630Image *Image_PS1_V5_ToInternal (Image_PS1_V5 *in, off_t Nvalues, off_t Nalloc) {
    623631
    … …  
    633641    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    634642
    635     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    636     out[i].name[120] = 0; // force termination
     643    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
     644    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     645    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    637646
    638647    out[i].tzero            = in[i].tzero;
    … …  
    654663    out[i].DECo             = in[i].DECo;
    655664    out[i].Radius           = in[i].Radius;
    656     out[i].refColor         = in[i].refColor;
     665    out[i].refColorBlue     = in[i].refColorBlue;
     666    out[i].refColorRed      = in[i].refColorRed;
    657667
    658668    out[i].detection_limit  = in[i].detection_limit;
    … …  
    696706    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    697707
    698     strncpy (out[i].name, in[i].name, 120); // out[121], in[121]
    699     out[i].name[120] = 0; // force termination
     708    // RAW_IMAGE_NAME_LEN == DVO_IMAGE_NAME_LEN
     709    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     710    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    700711
    701712    out[i].tzero            = in[i].tzero;
    … …  
    717728    out[i].DECo             = in[i].DECo;
    718729    out[i].Radius           = in[i].Radius;
    719     out[i].refColor         = in[i].refColor;
     730    out[i].refColorBlue     = in[i].refColorBlue;
     731    out[i].refColorRed      = in[i].refColorRed;
    720732
    721733    out[i].detection_limit  = in[i].detection_limit;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r36975 r37004  
    196196}
    197197
     198# define RAW_IMAGE_NAME_LEN 32
     199
    198200/* convert elixir-format images to internal images */
    199201Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues, off_t Nalloc) {
    … …  
    210212    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    211213
    212     strncpy (out[i].name, in[i].name, 31); // in[32], out[128]
    213     out[i].name[31] = 0; // force termination
     214    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     215    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     216    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    214217
    215218    out[i].tzero            = in[i].tzero;
    … …  
    279282    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    280283
    281     strncpy (out[i].name, in[i].name, 31); // out[32], in[128]
    282     out[i].name[31] = 0; // force termination
     284    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     285    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     286    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    283287
    284288    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r36975 r37004  
    174174}
    175175
     176# define RAW_IMAGE_NAME_LEN 32
     177
    176178/* convert loneos-format images to internal images */
    177179Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues, off_t Nalloc) {
    … …  
    188190    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    189191
    190     strncpy (out[i].name, in[i].name, 31); // in[32], out[128]
    191     out[i].name[31] = 0; // force termination
     192    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     193    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     194    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    192195
    193196    out[i].tzero            = in[i].tzero;
    … …  
    258261    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    259262
    260     strncpy (out[i].name, in[i].name, 31); // out[32], in[128]
    261     out[i].name[31] = 0; // force termination
     263    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     264    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     265    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    262266
    263267    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r36975 r37004  
    213213}
    214214
     215# define RAW_IMAGE_NAME_LEN 32
     216
    215217/* convert panstarrs-format images to internal images */
    216218Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues, off_t Nalloc) {
    … …  
    227229    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    228230
    229     strncpy (out[i].name, in[i].name, 31); // out[128], in[32]
    230     out[i].name[31] = 0; // force termination
     231    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     232    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     233    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    231234
    232235    out[i].tzero            = in[i].tzero;
    … …  
    296299    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    297300
    298     strncpy (out[i].name, in[i].name, 31); // out[32], in[128]
    299     out[i].name[31] = 0; // force termination
     301    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     302    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     303    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    300304
    301305    out[i].tzero            = in[i].tzero;

  • branches/eam_branches/ipp-20140610/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r36975 r37004  
    213213}
    214214
     215# define RAW_IMAGE_NAME_LEN 64
     216
    215217/* convert panstarrs-format images to internal images */
    216218Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues, off_t Nalloc) {
    … …  
    227229    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    228230
    229     strncpy (out[i].name, in[i].name, 63); // in[64], out[128]
    230     out[i].name[63] = 0; // force termination
     231    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     232    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     233    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    231234
    232235    out[i].tzero            = in[i].tzero;
    … …  
    296299    memcpy (&out[i].coords, &in[i].coords, sizeof(Coords));
    297300
    298     strncpy (out[i].name, in[i].name, 63); // in[128], out[64]
    299     out[i].name[63] = 0; // force termination
     301    // RAW_IMAGE_NAME_LEN < DVO_IMAGE_NAME_LEN
     302    strncpy (out[i].name, in[i].name, RAW_IMAGE_NAME_LEN - 1);
     303    out[i].name[RAW_IMAGE_NAME_LEN - 1] = 0; // force termination
    300304
    301305    out[i].tzero            = in[i].tzero;
Note: See TracChangeset for help on using the changeset viewer.