summaryrefslogtreecommitdiffstats
path: root/test/cross_read.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/cross_read.c')
-rw-r--r--test/cross_read.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/test/cross_read.c b/test/cross_read.c
index d2f74b6..cb71996 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -41,8 +41,10 @@ const char *FILENAME[] = {"vms_data", "le_data", "be_data", NULL};
#define DATASETNAME14 "Fletcher_float_data_le"
#define DATASETNAME15 "Fletcher_float_data_be"
+#ifdef H5_HAVE_FILTER_DEFLATE
#define DATASETNAME16 "Deflate_float_data_le"
#define DATASETNAME17 "Deflate_float_data_be"
+#endif
#ifdef H5_HAVE_FILTER_SZIP
#define DATASETNAME18 "Szip_float_data_le"
#define DATASETNAME19 "Szip_float_data_be"
@@ -121,7 +123,10 @@ check_data_i(const char *dsetname, hid_t fid)
return 0;
error:
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY;
return 1;
} /* end check_data_i() */
@@ -156,9 +161,9 @@ check_data_f(const char *dsetname, hid_t fid)
/* Input (last row is different) */
for (i = 0; i < NX; i++)
for (j = 0; j < NY; j++)
- data_in[i][j] = ((double)(i + j + 1)) / (double)3.0F;
+ data_in[i][j] = ((double)(i + j + 1)) / 3.0;
for (i = 0; i < NY; i++)
- data_in[NX][i] = -2.2F;
+ data_in[NX][i] = -2.2;
/* Output */
HDmemset(data_out, 0, (NX + 1) * NY * sizeof(double));
@@ -171,7 +176,7 @@ check_data_f(const char *dsetname, hid_t fid)
/* Check results */
for (i = 0; i < (NX + 1); i++)
for (j = 0; j < NY; j++)
- if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], (double)0.001F))
+ if (!H5_DBL_REL_EQUAL(data_out[i][j], data_in[i][j], 0.001))
if (!nerrors++) {
H5_FAILED();
HDprintf("element [%d][%d] is %g but should have been %g\n", (int)i, (int)j,
@@ -192,7 +197,10 @@ check_data_f(const char *dsetname, hid_t fid)
return 0;
error:
- H5E_BEGIN_TRY { H5Dclose(did); }
+ H5E_BEGIN_TRY
+ {
+ H5Dclose(did);
+ }
H5E_END_TRY;
return 1;
} /* end check_data_f() */
@@ -321,7 +329,10 @@ check_file(char *filename)
return nerrors;
error:
- H5E_BEGIN_TRY { H5Fclose(fid); }
+ H5E_BEGIN_TRY
+ {
+ H5Fclose(fid);
+ }
H5E_END_TRY;
return nerrors;
} /* end check_file() */