diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-02-26 14:07:30 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-02-26 14:39:03 +0100 |
| commit | 0cbb3c200d467a520783b07c0774bf3c62cac9b9 (patch) | |
| tree | 8baa38a6eac6d2f53c30651f9e762e4edc046de6 /src/pj_gridinfo.c | |
| parent | ac66e57366f11cd76d187dbc1e482d3f131dcd72 (diff) | |
| download | PROJ-0cbb3c200d467a520783b07c0774bf3c62cac9b9.tar.gz PROJ-0cbb3c200d467a520783b07c0774bf3c62cac9b9.zip | |
Raise MSVC warning level to /W4
Diffstat (limited to 'src/pj_gridinfo.c')
| -rw-r--r-- | src/pj_gridinfo.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index d54aadce..458f0f2b 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -63,7 +63,7 @@ static void swap_words( unsigned char *data, int word_size, int word_count ) for( i = 0; i < word_size/2; i++ ) { - int t; + unsigned char t; t = data[i]; data[i] = data[word_size-i-1]; @@ -427,7 +427,15 @@ static int pj_gridinfo_init_ntv2( projCtx ctx, PAFile fid, PJ_GRIDINFO *gilist ) assert( sizeof(int) == 4 ); assert( sizeof(double) == 8 ); +#ifdef _MSC_VER +#pragma warning( push ) +/* disable conditional expression is constant */ +#pragma warning( disable : 4127 ) +#endif if( sizeof(int) != 4 || sizeof(double) != 8 ) +#ifdef _MSC_VER +#pragma warning( pop ) +#endif { pj_log( ctx, PJ_LOG_ERROR, "basic types of inappropraiate size in pj_gridinfo_init_ntv2()" ); @@ -640,7 +648,15 @@ static int pj_gridinfo_init_ntv1( projCtx ctx, PAFile fid, PJ_GRIDINFO *gi ) assert( sizeof(int) == 4 ); assert( sizeof(double) == 8 ); +#ifdef _MSC_VER +#pragma warning( push ) +/* disable conditional expression is constant */ +#pragma warning( disable : 4127 ) +#endif if( sizeof(int) != 4 || sizeof(double) != 8 ) +#ifdef _MSC_VER +#pragma warning( pop ) +#endif { pj_log( ctx, PJ_LOG_ERROR, "basic types of inappropraiate size in nad_load_ntv1()" ); @@ -728,7 +744,15 @@ static int pj_gridinfo_init_gtx( projCtx ctx, PAFile fid, PJ_GRIDINFO *gi ) assert( sizeof(int) == 4 ); assert( sizeof(double) == 8 ); +#ifdef _MSC_VER +#pragma warning( push ) +/* disable conditional expression is constant */ +#pragma warning( disable : 4127 ) +#endif if( sizeof(int) != 4 || sizeof(double) != 8 ) +#ifdef _MSC_VER +#pragma warning( pop ) +#endif { pj_log( ctx, PJ_LOG_ERROR, "basic types of inappropraiate size in nad_load_gtx()" ); |