diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-06-18 18:37:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-06-18 18:37:49 (GMT) |
| commit | ed7658df795092d7bd50705cae4319adb5985289 (patch) | |
| tree | 78f3a1eb1e2fc5da697be2655b2f824710e5a6e1 /tools/h5repack/h5repack_filters.c | |
| parent | 879d58b86bacd743e75d78bed2c54f549aeb0a9d (diff) | |
| download | hdf5-ed7658df795092d7bd50705cae4319adb5985289.zip hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.gz hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.bz2 | |
[svn-r17085] Description:
Bring r17002:17084 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools/h5repack/h5repack_filters.c')
| -rw-r--r-- | tools/h5repack/h5repack_filters.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index 00d7c66..6b08a2f 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -445,14 +445,22 @@ int apply_filters(const char* name, /* object name from traverse list */ if (H5Pset_layout(dcpl_id, obj.layout)<0) return -1; - if (H5D_CHUNKED==obj.layout) { /* set up chunk */ + if (H5D_CHUNKED == obj.layout) + { if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0) return -1; } - else if (H5D_COMPACT==obj.layout) { + else if (H5D_COMPACT == obj.layout) + { if (H5Pset_alloc_time(dcpl_id, H5D_ALLOC_TIME_EARLY)<0) return -1; } + /* remove filters for the H5D_CONTIGUOUS case */ + else if (H5D_CONTIGUOUS == obj.layout) + { + if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0) + return -1; + } } |