summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-06-06 02:30:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-06-06 02:30:16 (GMT)
commit03dafc5ebe2f964c4b2bf4af323def564dbb76f6 (patch)
treec1af4fdcbde6cc6fddced1bc99c751bd6f2bc03a /hl
parentdd6c8994c01cd31b5230e98838f11e4c229fdb34 (diff)
downloadhdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.zip
hdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.tar.gz
hdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.tar.bz2
[svn-r30020] Description:
Bring r29992 from revise_chunks branch to trunk: Turn off error reporting for h5debug and hdf2gif. Tested on: MacOSX/64 10.11.5 (amazon) w/serial, parallel & produciton (h5committest forthcoming)
Diffstat (limited to 'hl')
-rw-r--r--hl/tools/gif2h5/hdf2gif.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index e03d5c4..8ed05df 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -48,6 +48,8 @@ FILE *fpGif = NULL;
int main(int argc , char **argv)
{
BYTE *Image;
+ void *edata;
+ H5E_auto2_t func;
/* compression structs */
CHAR *HDFName = NULL;
@@ -73,6 +75,10 @@ int main(int argc , char **argv)
char *image_name = NULL;
int idx;
+ /* Disable error reporting */
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
/* Initialize h5tools lib */
h5tools_init();
@@ -330,6 +336,8 @@ int main(int argc , char **argv)
if (image_name != NULL)
free(image_name);
+ H5Eset_auto2(H5E_DEFAULT, func, edata);
+
return EXIT_SUCCESS;
@@ -340,5 +348,7 @@ out:
if (image_name != NULL)
free(image_name);
+ H5Eset_auto2(H5E_DEFAULT, func, edata);
+
return EXIT_FAILURE;
}