core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows support: functions for rounding should be in latest VS

This commit is contained in:
Shahram Najm 2019-01-11 12:54:46 +00:00
parent 0e431eea67
commit 3badf8dbf3
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/grib_accessor_class_bits.c
View File

@ -150,10 +150,6 @@ static void init_class(grib_accessor_class* c)
/* END_CLASS_IMP */
#ifdef ECCODES_ON_WINDOWS
#define round(a) ( (a) >=0 ? ((a)+0.5) : ((a)-0.5) )
#endif
static void init(grib_accessor* a,const long l, grib_arguments* c)
{
grib_accessor_bits* self = (grib_accessor_bits*)a;

4
src/grib_accessor_class_g2grid.c
View File

@ -149,10 +149,6 @@ static void init_class(grib_accessor_class* c)
/* END_CLASS_IMP */
#ifdef ECCODES_ON_WINDOWS
#define round(a) ( (a) >=0 ? ((a)+0.5) : ((a)-0.5) )
#endif
static void init(grib_accessor* a,const long l, grib_arguments* c)
{
grib_accessor_g2grid* self = (grib_accessor_g2grid*)a;

14
src/grib_iterator_class_latlon.c
View File

@ -88,16 +88,6 @@ static void init_class(grib_iterator_class* c)
#define RAD2DEG 57.29577951308232087684 /* 180 over pi */
#define DEG2RAD 0.01745329251994329576 /* pi over 180 */
/* Note: roundf implementation missing on MSVC! */
static float round_float(float x)
{
#ifdef ECCODES_ON_WINDOWS
return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);
#else
return roundf(x);
#endif
}
void unrotate(grib_handle* h,
const double inlat, const double inlon,
const double angleOfRot, const double southPoleLat, const double southPoleLon,
@ -137,8 +127,8 @@ void unrotate(grib_handle* h,
ret_lon = atan2(y, x) * RAD2DEG;
/* Still get a very small rounding error, round to 6 decimal places */
ret_lat = round_float( ret_lat * 1000000.0 )/1000000.0;
ret_lon = round_float( ret_lon * 1000000.0 )/1000000.0;
ret_lat = roundf( ret_lat * 1000000.0 )/1000000.0;
ret_lon = roundf( ret_lon * 1000000.0 )/1000000.0;
ret_lon -= angleOfRot;