[svn-r26717] Merge revisions 26387, 26649, 26650, 26678, and 26691 from trunk to squish warnings.

3 files changed, 11 insertions, 13 deletions

diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index 5334919..f34a111 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -143,7 +143,7 @@ typedef struct _GifToMem {
 */
 
 /* GIF2MEM.C */
-GIFTOMEM Gif2Mem(BYTE *);
+int Gif2Mem(BYTE *, GIFTOMEM *);
 
 /* GIFREAD.C */
 int ReadGifHeader(GIFHEAD *, BYTE **);
diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 810be78..8a9e971 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -99,7 +99,7 @@ main(int argv , char *argc[])
      * Call Gif2Mem and break the whole file into parts.  Gif2Mem also calls
      * decompresses the images so we don't have to worry about that
      */
-    GifMemoryStruct = Gif2Mem(MemGif);
+    Gif2Mem(MemGif, &GifMemoryStruct);
 
     if (ferror(fpGif)) {
             printf("File Stream Error\n\n");
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index d816aa1..456a32d 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -37,8 +37,8 @@
 
 #include "gif.h"
 
-GIFTOMEM
-Gif2Mem(BYTE *MemGif)
+int
+Gif2Mem(BYTE *MemGif, GIFTOMEM *GifMemoryStruct)
 {
     /*
      * The gif structure outline for passing data to memory is given in gif.h.
@@ -51,8 +51,6 @@ Gif2Mem(BYTE *MemGif)
     GIFCOMMENT        **gifComment;        /* Comment Extension structure     */
     GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
 
-    GIFTOMEM GifMemoryStruct;
-
     register WORD i;        /* Loop counter                                 */
     BYTE Identifier;        /* Extension block identifier holder            */
     BYTE Label;             /* Extension block label holder                 */
@@ -133,15 +131,15 @@ Gif2Mem(BYTE *MemGif)
                 gifHead->PlainTextCount   = PlainTextCount;
 
                 /* putting stuff into the gif2mem structure */
-                GifMemoryStruct.GifHeader = gifHead;
-                GifMemoryStruct.GifImageDesc = gifImageDesc;
-                GifMemoryStruct.GifPlainTextExtension = gifPlainText;
-                GifMemoryStruct.GifApplicationExtension = gifApplication;
-                GifMemoryStruct.GifCommentExtension = gifComment;
-                GifMemoryStruct.GifGraphicControlExtension = gifGraphicControl;
+                GifMemoryStruct->GifHeader = gifHead;
+                GifMemoryStruct->GifImageDesc = gifImageDesc;
+                GifMemoryStruct->GifPlainTextExtension = gifPlainText;
+                GifMemoryStruct->GifApplicationExtension = gifApplication;
+                GifMemoryStruct->GifCommentExtension = gifComment;
+                GifMemoryStruct->GifGraphicControlExtension = gifGraphicControl;
 
                 /* return the struct */
-                return GifMemoryStruct;
+                return 0;
 
             case 0x2C:  /* Image Descriptor */
                 /*