Ignore:
Timestamp:
Apr 9, 2010 2:12:53 PM (12 years ago)
Author:
srkline
Message:

I think this resolved my conflicts...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/MonteCarlo/MonteCarlo.c

    r673 r677  
    156156        sig_incoh = inputWave[9]; 
    157157        sig_sas = inputWave[10]; 
    158         xCtr_long = (long)(xCtr+0.5); 
    159         yCtr_long = (long)(yCtr+0.5); 
     158        xCtr_long = (long)(xCtr+0.5);   //round() not defined in VC8 
     159        yCtr_long = (long)(yCtr+0.5);   // and is probably wrong to use anyways (returns double!) 
    160160         
    161161        dummy = MDGetWaveScaling(p->ran_devH, 0, &delta, &left);                //0 is the rows 
Note: See TracChangeset for help on using the changeset viewer.