[svn-r17522] Description:

	Bring in the rest of Vailin's changes for testing fixed array chunk
indices, across the range of range of all the tools and the appropriate dataset
tests.

Tested on:
	Mac OS X/32 10.5.8 (amazon) w/debug & production
	(h5committest not required for this branch)

4 files changed, 111 insertions, 62 deletions

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index d8a503c..d0a7a7d 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -90,13 +90,13 @@ int h5repack(const char* infile,
 *-------------------------------------------------------------------------
 */
 
-int h5repack_init (pack_opt_t *options,
-                   int verbose)
+int h5repack_init (pack_opt_t *options, int verbose, int latest)
 {
     int k, n;
     memset(options,0,sizeof(pack_opt_t));
     options->min_comp = 1024;
-    options->verbose   = verbose;
+    options->verbose  = verbose;
+    options->latest = latest ;
 
     for ( n = 0; n < H5_REPACK_MAX_NFILTERS; n++)
     {
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index cb3d75a..feabeaa 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -128,7 +128,7 @@ extern "C" {
 int h5repack           (const char* infile, const char* outfile, pack_opt_t *options);
 int h5repack_addfilter (const char* str, pack_opt_t *options);
 int h5repack_addlayout (const char* str, pack_opt_t *options);
-int h5repack_init      (pack_opt_t *options, int verbose);
+int h5repack_init      (pack_opt_t *options, int verbose, int latest);
 int h5repack_end       (pack_opt_t *options);
 int h5repack_verify    (const char *fname,pack_opt_t *options);
 int h5repack_cmp_pl   (const char *fname1,
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index d9ec7ad..d2aed2b 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -104,7 +104,7 @@ int main(int argc, const char **argv)
     int           ret=-1;
     
     /* initialize options  */
-    h5repack_init (&options,0);        
+    h5repack_init (&options,0, 0);        
     
     parse_command_line(argc, argv, &options);
     
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index d28750c..59652e0 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -184,7 +184,7 @@ int main (void)
     */
 
     TESTING("    copy of datasets (fill values)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME0,FNAME0OUT,&pack_options) < 0)
         GOERROR;
@@ -204,7 +204,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    copy of datasets (all datatypes)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
         GOERROR;
@@ -224,7 +224,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    copy of datasets (attributes)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME2,FNAME2OUT,&pack_options) < 0)
         GOERROR;
@@ -243,7 +243,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    copy of datasets (hardlinks)");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME3,FNAME3OUT,&pack_options) < 0)
         GOERROR;
@@ -263,7 +263,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    copy of allocation early file");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME5,FNAME5OUT,&pack_options) < 0)
         GOERROR;
@@ -284,7 +284,7 @@ int main (void)
     * deflate
     *-------------------------------------------------------------------------
     */
-    TESTING("    adding deflate filter");
+    TESTING("    adding deflate filter (old_format)");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
@@ -293,7 +293,34 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
+        GOERROR;
+    if (h5repack_addfilter("dset1:GZIP=9",&pack_options) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+#else
+    SKIPPED();
+#endif
+
+    TESTING("    adding deflate filter (new format)");
+#ifdef H5_HAVE_FILTER_DEFLATE
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    * 	For new format, "dset1" should be using Fixed Array indexing
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, 1) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:GZIP=9",&pack_options) < 0)
         GOERROR;
@@ -321,7 +348,7 @@ int main (void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
         GOERROR;
@@ -359,7 +386,7 @@ int main (void)
     */
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack_addfilter("dset2:SZIP=8,EC",&pack_options) < 0)
             GOERROR;
@@ -391,7 +418,7 @@ int main (void)
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack_addfilter("SZIP=8,NN",&pack_options) < 0)
             GOERROR;
@@ -422,7 +449,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:SHUF",&pack_options) < 0)
         GOERROR;
@@ -451,7 +478,7 @@ int main (void)
 
 #ifdef H5_HAVE_FILTER_SHUFFLE
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("SHUF",&pack_options) < 0)
         GOERROR;
@@ -480,7 +507,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:FLET",&pack_options) < 0)
         GOERROR;
@@ -510,7 +537,7 @@ int main (void)
 
 #ifdef H5_HAVE_FILTER_FLETCHER32
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("FLET",&pack_options) < 0)
         GOERROR;
@@ -538,7 +565,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CHUNK 20x10",&pack_options) < 0)
         GOERROR;
@@ -577,14 +604,36 @@ int main (void)
     PASSED();
 
 
-    TESTING("    adding layout chunked");
+    TESTING("    adding layout chunked (old format)");
+
+    /*-------------------------------------------------------------------------
+    * test an individual object option
+    *-------------------------------------------------------------------------
+    */
+
+    if (h5repack_init (&pack_options, 0, 0) < 0)
+        GOERROR;
+    if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
+        GOERROR;
+    if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
+        GOERROR;
+    if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) >0)
+        GOERROR;
+    if (h5repack_verify(FNAME4OUT,&pack_options)<=0)
+        GOERROR;
+    if (h5repack_end (&pack_options) < 0)
+        GOERROR;
+    PASSED();
+
+    TESTING("    adding layout chunked (new format)");
 
     /*-------------------------------------------------------------------------
     * test an individual object option
+    * 	For new format, "dset1" should be using Fixed Array indexing
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 1) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options) < 0)
         GOERROR;
@@ -604,7 +653,7 @@ int main (void)
     */
     TESTING("    adding layout chunked to all");
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("CHUNK=20x10",&pack_options) < 0)
         GOERROR;
@@ -625,7 +674,7 @@ int main (void)
     * test an individual object option
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CONTI",&pack_options) < 0)
         GOERROR;
@@ -646,7 +695,7 @@ int main (void)
     * test all objects option
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("CONTI",&pack_options) < 0)
         GOERROR;
@@ -663,7 +712,7 @@ int main (void)
     * do the same test for a file with filters (chunked)
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("CONTI",&pack_options) < 0)
         GOERROR;
@@ -685,7 +734,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:COMPA",&pack_options) < 0)
         GOERROR;
@@ -706,7 +755,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("COMPA",&pack_options) < 0)
         GOERROR;
@@ -728,7 +777,7 @@ int main (void)
     * layout compact to contiguous conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:CONTI",&pack_options) < 0)
         GOERROR;
@@ -748,7 +797,7 @@ int main (void)
     * layout compact to chunk conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:CHUNK=2x5",&pack_options) < 0)
         GOERROR;
@@ -768,7 +817,7 @@ int main (void)
     * layout compact to compact conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:COMPA",&pack_options) < 0)
         GOERROR;
@@ -787,7 +836,7 @@ int main (void)
     * layout contiguous to compact conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options) < 0)
         GOERROR;
@@ -806,7 +855,7 @@ int main (void)
     * layout contiguous to chunk conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:CHUNK=3x6",&pack_options) < 0)
         GOERROR;
@@ -826,7 +875,7 @@ int main (void)
     * layout contiguous to contiguous conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options) < 0)
         GOERROR;
@@ -845,7 +894,7 @@ int main (void)
     * layout chunked to compact conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:COMPA",&pack_options) < 0)
         GOERROR;
@@ -865,7 +914,7 @@ int main (void)
     * layout chunked to contiguous conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:CONTI",&pack_options) < 0)
         GOERROR;
@@ -884,7 +933,7 @@ int main (void)
     * layout chunked to chunked conversion
     *-------------------------------------------------------------------------
     */
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:CHUNK=18x13",&pack_options) < 0)
         GOERROR;
@@ -914,7 +963,7 @@ int main (void)
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
             GOERROR;
@@ -939,7 +988,7 @@ int main (void)
 
 #if defined (H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_szip:NONE",&pack_options) < 0)
             GOERROR;
@@ -964,7 +1013,7 @@ int main (void)
     TESTING("    copy of deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
         GOERROR;
@@ -984,7 +1033,7 @@ int main (void)
     TESTING("    removing deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_deflate:NONE",&pack_options) < 0)
         GOERROR;
@@ -1007,7 +1056,7 @@ int main (void)
     TESTING("    copy of shuffle filter");
 
 #ifdef H5_HAVE_FILTER_SHUFFLE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
         GOERROR;
@@ -1026,7 +1075,7 @@ int main (void)
     TESTING("    removing shuffle filter");
 
 #ifdef H5_HAVE_FILTER_SHUFFLE
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_shuffle:NONE",&pack_options) < 0)
         GOERROR;
@@ -1047,7 +1096,7 @@ int main (void)
     TESTING("    copy of fletcher filter");
 
 #ifdef H5_HAVE_FILTER_FLETCHER32
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
         GOERROR;
@@ -1066,7 +1115,7 @@ int main (void)
     TESTING("    removing fletcher filter");
 
 #ifdef H5_HAVE_FILTER_FLETCHER32
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options) < 0)
         GOERROR;
@@ -1088,7 +1137,7 @@ int main (void)
     TESTING("    copy of nbit filter");
 
 #ifdef H5_HAVE_FILTER_NBIT
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
         GOERROR;
@@ -1107,7 +1156,7 @@ int main (void)
     TESTING("    removing nbit filter");
 
 #ifdef H5_HAVE_FILTER_NBIT
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_nbit:NONE",&pack_options) < 0)
         GOERROR;
@@ -1129,7 +1178,7 @@ int main (void)
     TESTING("    adding nbit filter");
 
 #ifdef H5_HAVE_FILTER_NBIT
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_int31:NBIT",&pack_options) < 0)
         GOERROR;
@@ -1151,7 +1200,7 @@ int main (void)
     TESTING("    copy of scaleoffset filter");
 
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
         GOERROR;
@@ -1170,7 +1219,7 @@ int main (void)
     TESTING("    removing scaleoffset filter");
 
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options) < 0)
         GOERROR;
@@ -1192,7 +1241,7 @@ int main (void)
     TESTING("    adding scaleoffset filter");
 
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_none:SOFF=31,IN",&pack_options) < 0)
         GOERROR;
@@ -1230,7 +1279,7 @@ int main (void)
     && defined (H5_HAVE_FILTER_FLETCHER32) && defined (H5_HAVE_FILTER_SHUFFLE)
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_deflate:SZIP=8,NN",&pack_options) < 0)
             GOERROR;
@@ -1258,7 +1307,7 @@ int main (void)
     && defined (H5_HAVE_FILTER_FLETCHER32) && defined (H5_HAVE_FILTER_SHUFFLE)
 
     if (szip_can_encode) {
-        if (h5repack_init (&pack_options, 0) < 0)
+        if (h5repack_init (&pack_options, 0, 0) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_szip:GZIP=1",&pack_options) < 0)
             GOERROR;
@@ -1290,7 +1339,7 @@ int main (void)
 #if defined (H5_HAVE_FILTER_SZIP) && defined (H5_HAVE_FILTER_DEFLATE) \
     && defined (H5_HAVE_FILTER_FLETCHER32) && defined (H5_HAVE_FILTER_SHUFFLE)
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("NONE",&pack_options) < 0)
         GOERROR;
@@ -1313,7 +1362,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    big file");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME14,FNAME14OUT,&pack_options) < 0)
         GOERROR;
@@ -1330,7 +1379,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    external datasets");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack(FNAME15,FNAME15OUT,&pack_options) < 0)
         GOERROR;
@@ -1347,7 +1396,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    file with userblock");
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, 0) < 0)
         GOERROR;
     if(h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
         GOERROR;
@@ -1366,7 +1415,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
     TESTING("    latest file format options");
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     pack_options.latest=1;
     pack_options.grp_compact=10;
@@ -1396,7 +1445,7 @@ int main (void)
 
 #if defined (H5_HAVE_FILTER_DEFLATE) && defined (H5_HAVE_FILTER_SHUFFLE)
 
-    if (h5repack_init (&pack_options, 0) < 0)
+    if (h5repack_init (&pack_options, 0, 0) < 0)
         GOERROR;
     if (h5repack_addfilter("GZIP=1",&pack_options) < 0)
         GOERROR;
@@ -1425,7 +1474,7 @@ int main (void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, 0) < 0)
         GOERROR;
 
     /* add the options for a user block size and user block filename */
@@ -1458,7 +1507,7 @@ int main (void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, 0) < 0)
         GOERROR;
 
     /* add the options for aligment */
@@ -1513,7 +1562,7 @@ int main (void)
     */
     TESTING("    file with committed datatypes");
 
-    if(h5repack_init(&pack_options, 0) < 0)
+    if(h5repack_init(&pack_options, 0, 0) < 0)
         GOERROR;
 
     if(h5repack(FNAME17, FNAME17OUT, &pack_options) < 0)