[svn-r24205] Merge HDFFV-8513/8522 from trunk (via cmake branch), h5repack UD plugins.

Also warning session fixes.

Tested: CMake local linux

1 files changed, 13 insertions, 5 deletions

diff --git a/tools/h5repack/testfiles/h5repack-help.txt b/tools/h5repack/testfiles/h5repack-help.txt
index 67e31fe..ba58bc6 100644
--- a/tools/h5repack/testfiles/h5repack-help.txt
+++ b/tools/h5repack/testfiles/h5repack-help.txt
@@ -45,6 +45,7 @@ usage: h5repack [OPTIONS] file1 file2
         FLET, to apply the HDF5 checksum filter
         NBIT, to apply the HDF5 NBIT filter (NBIT compression)
         SOFF, to apply the HDF5 Scale/Offset filter
+        UD,   to apply a user defined filter
         NONE, to remove all filters
       <filter parameters> is optional filter parameter information
         GZIP=<deflation level> from 1-9
@@ -55,6 +56,9 @@ usage: h5repack [OPTIONS] file1 file2
         NBIT (no parameter)
         SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type
             is either IN or DS
+        UD=<filter_number,cd_value_count,value_1[,value_2,...,value_N]>
+            required values for filter_number,cd_value_count,value_1
+            optional values for value_2 to value_N
         NONE (no parameter)
 
     LAYT - is a string with the format:
@@ -79,14 +83,14 @@ Examples of use:
 
    GZIP compression with level 1 to all objects
 
-2) h5repack -v -f A:SZIP=8,NN file1 file2
+2) h5repack -v -f dset1:SZIP=8,NN file1 file2
 
-   SZIP compression with 8 pixels per block and NN coding method to object A
+   SZIP compression with 8 pixels per block and NN coding method to object dset1
 
-3) h5repack -v -l A,B:CHUNK=20x10 -f C,D,F:NONE file1 file2
+3) h5repack -v -l dset1,dset2:CHUNK=20x10 -f dset3,dset4,dset5:NONE file1 file2
 
-   Chunked layout, with a layout size of 20x10, to objects A and B
-   and remove filters to objects C, D, F
+   Chunked layout, with a layout size of 20x10, to objects dset1 and dset2
+   and remove filters to objects dset3, dset4, dset5
 
 4) h5repack -L -c 10 -s 20:dtype file1 file2 
 
@@ -97,3 +101,7 @@ Examples of use:
 
    Add both filters SHUF and GZIP in this order to all datasets
 
+6) h5repack -f UD=307,1,9 file1 file2 
+
+   Add bzip2 filter to all datasets
+