diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-09-28 16:49:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-09-28 16:49:06 (GMT) |
| commit | 50d3fc7a61f4b1dbe2ead376b778f5743060cc6e (patch) | |
| tree | cc0f0e419e786bc47a4acfb479671faf717bdd9f /tools/h5repack/h5repack_filters.c | |
| parent | 0f89cff001e619bf5eeb5351f2e32fc06075cc5e (diff) | |
| download | hdf5-50d3fc7a61f4b1dbe2ead376b778f5743060cc6e.zip hdf5-50d3fc7a61f4b1dbe2ead376b778f5743060cc6e.tar.gz hdf5-50d3fc7a61f4b1dbe2ead376b778f5743060cc6e.tar.bz2 | |
Merge/align with trunk
Diffstat (limited to 'tools/h5repack/h5repack_filters.c')
| -rw-r--r-- | tools/h5repack/h5repack_filters.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 56e08ef..e873a53 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -34,8 +34,8 @@ * *------------------------------------------------------------------------- */ -static -int aux_find_obj(const char* name, /* object name from traverse list */ +static int +aux_find_obj(const char* name, /* object name from traverse list */ pack_opt_t *options, /* repack options */ pack_info_t *obj /*OUT*/) /* info about object to filter */ { @@ -48,7 +48,7 @@ int aux_find_obj(const char* name, /* object name from traverse list */ if (HDstrcmp(options->op_tbl->objs[i].path,name)==0) { *obj = options->op_tbl->objs[i]; - return i; + return (int)i; } pdest = HDstrstr(name,options->op_tbl->objs[i].path); @@ -58,7 +58,7 @@ int aux_find_obj(const char* name, /* object name from traverse list */ if( pdest != NULL && result==1 ) { *obj = options->op_tbl->objs[i]; - return i; + return (int)i; } }/*i*/ @@ -76,8 +76,8 @@ int aux_find_obj(const char* name, /* object name from traverse list */ * *------------------------------------------------------------------------- */ -static -int aux_assign_obj(const char* name, /* object name from traverse list */ +static int +aux_assign_obj(const char* name, /* object name from traverse list */ pack_opt_t *options, /* repack options */ pack_info_t *obj /*OUT*/) /* info about object to filter */ { @@ -433,7 +433,7 @@ int apply_filters(const char* name, /* object name from traverse list */ int scale_factor; scale_type = (H5Z_SO_scale_type_t)obj.filter[i].cd_values[0]; - scale_factor = obj.filter[i].cd_values[1]; + scale_factor = (int)obj.filter[i].cd_values[1]; if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0) return -1; |