[svn-r9727] Purpose:

    Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)

Description:
    Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation.  So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.

    I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
    FreeBSD 4.10 (sleipnir) w/threadsafe
    FreeBSD 4.10 (sleipnir) w/backward compatibility
    Solaris 2.7 (arabica) w/"purify options"
    Solaris 2.8 (sol) w/FORTRAN & C++
    AIX 5.x (copper) w/parallel & FORTRAN
    IRIX64 6.5 (modi4) w/FORTRAN
    Linux 2.4 (heping) w/FORTRAN & C++


Misc. update:

1 files changed, 8 insertions, 4 deletions

diff --git a/tools/h5repack/testh5repack_make.c b/tools/h5repack/testh5repack_make.c
index 6149bd9..65a1c4a 100644
--- a/tools/h5repack/testh5repack_make.c
+++ b/tools/h5repack/testh5repack_make.c
@@ -27,7 +27,9 @@ int make_attributes(hid_t loc_id);
 int make_hlinks(hid_t loc_id);
 int make_early(void);
 int make_layout(hid_t loc_id);
+#ifdef H5_HAVE_FILTER_SZIP
 int make_szip(hid_t loc_id);
+#endif /* H5_HAVE_FILTER_SZIP */
 int make_deflate(hid_t loc_id);
 int make_shuffle(hid_t loc_id);
 int make_fletcher32(hid_t loc_id);
@@ -113,12 +115,14 @@ int make_testfiles(void)
  * create a file with the SZIP filter
  *-------------------------------------------------------------------------
  */
+#ifdef H5_HAVE_FILTER_SZIP
  if((loc_id = H5Fcreate(FNAME7,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
   return -1;
  if (make_szip(loc_id)<0)
   goto out;
  if(H5Fclose(loc_id)<0)
   return -1;
+#endif /* H5_HAVE_FILTER_SZIP */
 
 /*-------------------------------------------------------------------------
  * create a file with the deflate filter
@@ -362,6 +366,7 @@ int make_hlinks(hid_t loc_id)
  *
  *-------------------------------------------------------------------------
  */
+#ifdef H5_HAVE_FILTER_SZIP
 int make_szip(hid_t loc_id)
 {
  hid_t    dcpl; /* dataset creation property list */
@@ -372,9 +377,7 @@ int make_szip(hid_t loc_id)
  hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
  int      buf[DIM1][DIM2];
  int      i, j, n;
-#if defined (H5_HAVE_FILTER_SZIP)
  int szip_can_encode = 0;
-#endif
 
  for (i=n=0; i<DIM1; i++){
   for (j=0; j<DIM2; j++){
@@ -396,7 +399,6 @@ int make_szip(hid_t loc_id)
  *-------------------------------------------------------------------------
  */
  /* Make sure encoding is enabled */
-#if defined (H5_HAVE_FILTER_SZIP)
 if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) {
    szip_can_encode = 1;
 }
@@ -409,7 +411,6 @@ if (szip_can_encode) {
 } else {
 	/* WARNING? SZIP is decoder only, can't generate test files */
 }
-#endif
 
  if(H5Sclose(sid)<0)
   goto out;
@@ -425,6 +426,7 @@ out:
  } H5E_END_TRY;
  return -1;
 }
+#endif /* H5_HAVE_FILTER_SZIP */
 
 
 
@@ -633,8 +635,10 @@ int make_all(hid_t loc_id)
 {
  hid_t    dcpl; /* dataset creation property list */
  hid_t    sid;  /* dataspace ID */
+#if defined (H5_HAVE_FILTER_SZIP)
  unsigned szip_options_mask=H5_SZIP_ALLOW_K13_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
  unsigned szip_pixels_per_block=8;
+#endif /* H5_HAVE_FILTER_SZIP */
  hsize_t  dims[RANK]={DIM1,DIM2};
  hsize_t  chunk_dims[RANK]={CDIM1,CDIM2};
  int      buf[DIM1][DIM2];