From 95a5973ea1ec6a5135f615ada5201b1bbd83c49f Mon Sep 17 00:00:00 2001 From: Aaron Farnham Date: Thu, 11 Dec 2014 11:10:15 -0600 Subject: [PATCH] Type changes and explicit casts to fix warnings in 64-bit builds --- ObjectiveWMM/WMM/GeomagnetismLibrary.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ObjectiveWMM/WMM/GeomagnetismLibrary.c b/ObjectiveWMM/WMM/GeomagnetismLibrary.c index 6f9ae5b..baba1c7 100644 --- a/ObjectiveWMM/WMM/GeomagnetismLibrary.c +++ b/ObjectiveWMM/WMM/GeomagnetismLibrary.c @@ -2126,8 +2126,8 @@ int MAG_readMagneticModel_SHDF(char *filename, MAGtype_MagneticModel *(*magnetic char *line = (char *) malloc(MAXLINELENGTH); char *ptrreset; char paramvalue[MAXLINELENGTH]; - int paramvaluelength = 0; - int paramkeylength = 0; + long paramvaluelength = 0; + long paramkeylength = 0; int i = 0, j = 0; int newrecord = 1; int header_index = -1; @@ -2715,7 +2715,7 @@ int MAG_GetUTMParameters(double Latitude, *CentralMeridian = (6 * temp_zone - 183) * M_PI / 180.0; else *CentralMeridian = (6 * temp_zone + 177) * M_PI / 180.0; - *Zone = temp_zone; + *Zone = (int)temp_zone; if(Latitude < 0) *Hemisphere = 'S'; else *Hemisphere = 'N'; } @@ -3933,7 +3933,8 @@ OUPUT Pointer to data structure Geoid with the following elements updated CALLS : none */ { - int ElevationsRead, SwabType, Index; + long ElevationsRead; + int SwabType, Index; FILE *GeoidHeightFile;