[svn-r22013] HDFFV-7560:

Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest

3 files changed, 9 insertions, 1 deletions

diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 1225613..810be78 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 
 #include "gif.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 
@@ -49,6 +50,9 @@ main(int argv , char *argc[])
     GifMemoryStruct.GifApplicationExtension    = NULL;
     GifMemoryStruct.GifCommentExtension        = NULL;
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
     if ( argc[1] && (strcmp("-V",argc[1])==0) )
     {
         print_version("gif2h5");
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index 907fb80..7995bb4 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -37,7 +37,7 @@
 
 #include "gif.h"
 
-#define VERSION                     "1.00"
+#define GIF2VERSION                     "1.00"
 
 GIFTOMEM
 Gif2Mem(BYTE *MemGif)
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index cc8e864..090d657 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -17,6 +17,7 @@
 #include <assert.h>
 #include "gif.h"
 #include "H5IMpublic.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 
@@ -70,6 +71,9 @@ int main(int argc , char **argv)
     char *image_name = NULL;
     int idx;
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
     if ( argv[1] && (strcmp("-V",argv[1])==0) )
     {
         print_version("gif2h5");