[svn-r4591] Purpose:

    Code cleanup
Description:
    Fix a bunch of warnings
Platforms tested:
    Linux 2.2 (eirene)

3 files changed, 9 insertions, 4 deletions

diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c
index eafa133..6cc5468 100644
--- a/hl/tools/gif2h5/decompress.c
+++ b/hl/tools/gif2h5/decompress.c
@@ -235,7 +235,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
             FreeCode = FirstFree;
             CurCode = OldCode = Code = ReadCode();
             FinChar = CurCode & DataMask;
-            AddToPixel(FinChar);
+            AddToPixel((BYTE)FinChar);
         } else {
             /*
              * If not a clear code, then must be data: save same as CurCode
@@ -275,7 +275,7 @@ Decompress(GIFIMAGEDESC *GifImageDesc, GIFHEAD *GifHead)
              * stacked LIFO, so deal with it that way...
              */
             for (i = OutCount - 1; i >= 0; i--)
-                AddToPixel(OutCode[i]);
+                AddToPixel((BYTE)OutCode[i]);
 
             OutCount = 0;
 
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index 21ce502..a939e17 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -144,6 +144,11 @@ int ReadGifPlainText(GIFPLAINTEXT *, BYTE **);
 int ReadGifApplication(GIFAPPLICATION *, BYTE **);
 int ReadGifComment(GIFCOMMENT *, BYTE **);
 
+/* HDFGIFWR.C */
+int hdfWriteGIF(FILE *fp, BYTE *pic, int ptype, int w, int h, BYTE *rmap,
+                BYTE *gmap, BYTE *bmap, BYTE *pc2ncmap, int numcols,
+                int colorstyle, int BitsPerPixel);
+
 /* WRITEHDF.C */
 int WriteHDF(GIFTOMEM , CHAR * , CHAR *);
 
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index 9b5eebc..c2ddb10 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -106,8 +106,8 @@ int main(int argc , char **argv)
         return 0;
     }
 
-    memset(image_name_arr , NULL , MAX_NUMBER_IMAGES);
-    memset(pal_name_arr , NULL , MAX_NUMBER_IMAGES);
+    memset(image_name_arr , 0 , MAX_NUMBER_IMAGES);
+    memset(pal_name_arr , 0 , MAX_NUMBER_IMAGES);
 
     HDFName = (CHAR *)malloc (strlen(argv[1]) + 1);
     GIFName = (CHAR *)malloc (strlen(argv[2]) + 1);