[svn-r19413] Description:

	Bring r19349:19411 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/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) 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, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

1 files changed, 9 insertions, 6 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index b736c22..6c47cfb 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -687,14 +687,11 @@ int do_copy_objects(hid_t fidin,
 
             /* check if filters were requested for individual objects */
             for (u = 0; u < options->op_tbl->nelems; u++) {
-                int k;
 
                 if (strcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0) {
-                    for (k = 0; k < options->op_tbl->objs[u].nfilters; k++) {
                         if (options->op_tbl->objs[u].filter->filtn > 0) {
                             req_filter = 1;
                         }
-                    }
                 }
             }
 
@@ -789,9 +786,15 @@ int do_copy_objects(hid_t fidin,
                         /* get the storage size of the input dataset */
                         dsize_in=H5Dget_storage_size(dset_in);
 
-                        /* check for datasets too small */
-                        if (nelmts*msize < options->min_comp )
-                            apply_s=0;
+                        /* check for small size datasets (less than 1k) except 
+                         * changing to COMPACT. For the reference, COMPACT is limited
+                         * by size 64K by library.
+                         */
+                        if (options->layout_g != H5D_COMPACT)
+                        {
+                            if ( nelmts*msize < options->min_comp )
+                                apply_s=0;
+                        }
 
                         /* apply the filter */
                         if (apply_s)