[svn-r4643] Purpose:

    Code cleanup
Description:
    Windows is generating hundreds of warnings from some of the practices in
    the library.  Mostly, they are because size_t is 32-bit and hsize_t is
    64-bit on Windows and we were carelessly casting the larger values down to
    the smaller ones without checking for overflow.

    Also, some other small code cleanups,etc.

Solution:
    Re-worked some algorithms to eliminate the casts and also added more
    overflow checking for assignments and function parameters which needed
    casts.

    Kent did most of the work, I just went over his changes and fit them into
    the the library code a bit better.

Platforms tested:
    FreeBSD 4.4 (hawkwind)

1 files changed, 5 insertions, 3 deletions

diff --git a/tools/gifconv/hdf2gif.c b/tools/gifconv/hdf2gif.c
index c2ddb10..cc7bab4 100644
--- a/tools/gifconv/hdf2gif.c
+++ b/tools/gifconv/hdf2gif.c
@@ -16,7 +16,7 @@
  */
 
 #include <stdio.h>
-
+#include <assert.h>
 #include "gif.h"
 
 #define MAX_FILE_LEN            256
@@ -208,8 +208,10 @@ int main(int argc , char **argv)
             return -1;
         }
 
-        RWidth  = dim_sizes[1];
-        RHeight = dim_sizes[0];
+		assert(dim_sizes[0]==(hsize_t)((int)dim_sizes[0]));
+		assert(dim_sizes[1]==(hsize_t)((int)dim_sizes[1]));
+        RWidth  = (int)dim_sizes[1];
+        RHeight = (int)dim_sizes[0];
 #ifdef UNUSED
         w = dim_sizes[1];
         h = dim_sizes[0];