[svn-r20029] Purpose: Fix bug 2131

Description:
When using the scale-offset filter with floating point data or fill values, big
endian machines would save some metadata in the wrong byte order.  This caused
such datasets to yield incorrect data when read on little endian machines.
Fixed the scale-offset filter to always save this metadata in the right byte order (i.e. little endian).

Tested: jam, amani, heiwa (h5committedt); fedora, linew

1 files changed, 680 insertions, 57 deletions

diff --git a/test/cross_read.c b/test/cross_read.c
index 279d102..6588031 100755
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -32,9 +32,19 @@ const char *FILENAME[] = {
 };
 
 #define DATASETNAME        "Array"
-#define DATASETNAME2       "Scale_offset_double_data"
-#define DATASETNAME3       "Scale_offset_int_data"
-#define NX 		6         
+#define DATASETNAME2       "Scale_offset_float_data_le"
+#define DATASETNAME3       "Scale_offset_float_data_be"
+#define DATASETNAME4       "Scale_offset_double_data_le"
+#define DATASETNAME5       "Scale_offset_double_data_be"
+#define DATASETNAME6       "Scale_offset_char_data_le"
+#define DATASETNAME7       "Scale_offset_char_data_be"
+#define DATASETNAME8       "Scale_offset_short_data_le"
+#define DATASETNAME9       "Scale_offset_short_data_be"
+#define DATASETNAME10      "Scale_offset_int_data_le"
+#define DATASETNAME11      "Scale_offset_int_data_be"
+#define DATASETNAME12      "Scale_offset_long_long_data_le"
+#define DATASETNAME13      "Scale_offset_long_long_data_be"
+#define NX 		6
 #define NY 		6
 
 
@@ -57,18 +67,13 @@ static int read_data(char *fname)
 {
     const char *pathname = H5_get_srcdir_filename(fname); /* Corrected test file name */
     hid_t       file, dataset;         /* handles */
-    hid_t       datatype;
-    hid_t	dt;
-    float       data_in[NX][NY]; /* input buffer */
-    float       data_out[NX][NY]; /* output buffer */
-    double      double_data_in[NX][NY]; /* input buffer */
-    double      double_data_out[NX][NY]; /* output buffer */
-    int         int_data_in[NX][NY]; /* input buffer */
-    int         int_data_out[NX][NY]; /* output buffer */
+    double      data_in[NX+1][NY]; /* input buffer */
+    double      data_out[NX+1][NY]; /* output buffer */
+    long long   int_data_in[NX+1][NY]; /* input buffer */
+    long long   int_data_out[NX+1][NY]; /* output buffer */
     int         i, j;
     unsigned 	nerrors = 0;
     const char  *not_supported= "    Scaleoffset filter is not enabled.";
-    const char  *not_fixed= "    Scaleoffset filter bug (2131) is not fixed yet.";
 
     /*
      * Open the file.
@@ -76,8 +81,8 @@ static int read_data(char *fname)
     if((file = H5Fopen(pathname, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
-    TESTING("	regular dataset");
-    
+    TESTING("regular dataset");
+
     /* 
      * Open the regular dataset.
      */
@@ -93,6 +98,10 @@ static int read_data(char *fname)
 	    data_out[j][i] = 0;
         }
     }
+    for (i = 0; i < NY; i++) {
+        data_in[NX][i] = -2.2;
+        data_out[NX][i] = 0;
+    }
     /*
      * 0 1 2 3 4 5
      * 1 2 3 4 5 6
@@ -100,29 +109,80 @@ static int read_data(char *fname)
      * 3 4 5 6 7 8
      * 4 5 6 7 8 9
      * 5 6 7 8 9 10
+     * -2.2 -2.2 -2.2 -2.2 -2.2 -2.2
      */
 
     /*
-     * Get datatype and dataspace handles and then query
-     * dataset class, order, size, rank and dimensions.
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
      */
-    if((dt = H5Dget_type(dataset)) < 0)     /* datatype handle */
+    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            data_out) < 0)
         TEST_ERROR;
-    if((datatype = H5Tget_native_type(dt, H5T_DIR_DEFAULT)) < 0)
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            /* if (data_out[j][i] != data_in[j][i]) { */
+            if (!FLT_ABS_EQUAL(data_out[j][i], data_in[j][i])) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %g but should have been %g\n",
+                           j, i, data_out[j][i], data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+    TESTING("dataset of LE FLOAT with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME2, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            data_in[j][i] = ((double)(i + j + 1))/3;
+            data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        data_in[NX][i] = -2.2;
+        data_out[NX][i] = 0;
+    }
+
+    /*
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    if(H5Dread(dataset, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_out) < 0)
+    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            data_out) < 0)
         TEST_ERROR;
 
     /* Check results */
-    for (j=0; j<NX; j++) {
+    for (j=0; j<(NX+1); j++) {
         for (i=0; i<NY; i++) {
-            /* if (data_out[j][i] != data_in[j][i]) { */
-            if (!DBL_ABS_EQUAL(data_out[j][i], data_in[j][i])) {
+            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
                 if (!nerrors++) {
                     H5_FAILED();
                     printf("element [%d][%d] is %g but should have been %g\n",
@@ -135,9 +195,8 @@ static int read_data(char *fname)
     /*
      * Close/release resources.
      */
-    H5Tclose(dt);
-    H5Tclose(datatype);
-    H5Dclose(dataset);
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
 
     /* Failure */
     if (nerrors) {
@@ -146,14 +205,80 @@ static int read_data(char *fname)
     }
 
     PASSED();
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of BE FLOAT with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME3, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            data_in[j][i] = ((double)(i + j + 1))/3;
+            data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        data_in[NX][i] = -2.2;
+        data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %g but should have been %g\n",
+                           j, i, data_out[j][i], data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of LE DOUBLE with scale-offset filter");
 
-    TESTING("	dataset of DOUBLE with scale-offset filter");
-#ifdef TMP
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
     /* 
      * Open the dataset with scale-offset filter.
      */
-    if((dataset = H5Dopen2(file, DATASETNAME2, H5P_DEFAULT)) < 0)
+    if((dataset = H5Dopen2(file, DATASETNAME4, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
@@ -161,35 +286,220 @@ static int read_data(char *fname)
      */
     for (j = 0; j < NX; j++) {
 	for (i = 0; i < NY; i++) {
-	    double_data_in[j][i] = ((double)(i + j + 1))/3;
-	    double_data_out[j][i] = 0;
+	    data_in[j][i] = ((double)(i + j + 1))/3;
+	    data_out[j][i] = 0;
         }
     }
+    for (i = 0; i < NY; i++) {
+        data_in[NX][i] = -2.2;
+        data_out[NX][i] = 0;
+    }
 
     /*
-     * Get datatype and dataspace handles and then query
-     * dataset class, order, size, rank and dimensions.
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
      */
-    if((dt = H5Dget_type(dataset)) < 0)     /* datatype handle */
+    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            data_out) < 0)
         TEST_ERROR;
-    if((datatype = H5Tget_native_type(dt, H5T_DIR_DEFAULT)) < 0)
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %g but should have been %g\n",
+                           j, i, data_out[j][i], data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of BE DOUBLE with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME5, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            data_in[j][i] = ((double)(i + j + 1))/3;
+            data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        data_in[NX][i] = -2.2;
+        data_out[NX][i] = 0;
+    }
+
+    /*
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    if(H5Dread(dataset, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, double_data_out) < 0)
+    if(H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            data_out) < 0)
         TEST_ERROR;
 
     /* Check results */
-    for (j=0; j<NX; j++) {
+    for (j=0; j<(NX+1); j++) {
         for (i=0; i<NY; i++) {
-            if (!DBL_REL_EQUAL(double_data_out[j][i], double_data_in[j][i], 0.001)) {
+            if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001)) {
                 if (!nerrors++) {
                     H5_FAILED();
                     printf("element [%d][%d] is %g but should have been %g\n",
-                           j, i, double_data_out[j][i], double_data_in[j][i]);
+                           j, i, data_out[j][i], data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of LE CHAR with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME6, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of BE CHAR with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME7, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
                 }
             }
         }
@@ -198,9 +508,8 @@ static int read_data(char *fname)
     /*
      * Close/release resources.
      */
-    H5Tclose(dt);
-    H5Tclose(datatype);
-    H5Dclose(dataset);
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
 
     /* Failure */
     if (nerrors) {
@@ -209,22 +518,147 @@ static int read_data(char *fname)
     }
 
     PASSED();
+
 #else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
-#else /*TMP*/
+
+    TESTING("dataset of LE SHORT with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME8, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
     SKIPPED();
-    puts(not_fixed);
-#endif /*TMP*/
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
-    TESTING("	dataset of INT with scale-offset filter");
+    TESTING("dataset of BE SHORT with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME9, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of LE INT with scale-offset filter");
 
 #ifdef H5_HAVE_FILTER_SCALEOFFSET
     /* 
      * Open the dataset with scale-offset filter.
      */
-    if((dataset = H5Dopen2(file, DATASETNAME3, H5P_DEFAULT)) < 0)
+    if((dataset = H5Dopen2(file, DATASETNAME10, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
@@ -236,31 +670,220 @@ static int read_data(char *fname)
 	    int_data_out[j][i] = 0;
         }
     }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of BE INT with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME11, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
 
     /*
-     * Get datatype and dataspace handles and then query
-     * dataset class, order, size, rank and dimensions.
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
      */
-    if((dt = H5Dget_type(dataset)) < 0)     /* datatype handle */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
         TEST_ERROR;
-    if((datatype = H5Tget_native_type(dt, H5T_DIR_DEFAULT)) < 0)
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of LE LONG LONG with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME12, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
+
+    /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
+     * Read data from hyperslab in the file into the hyperslab in
+     * memory and display.
+     */
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
+        TEST_ERROR;
+
+    /* Check results */
+    for (j=0; j<(NX+1); j++) {
+        for (i=0; i<NY; i++) {
+            if (int_data_out[j][i] != int_data_in[j][i]) {
+                if (!nerrors++) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been %d\n",
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
+                }
+            }
+        }
+    }
+
+    /*
+     * Close/release resources.
+     */
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
+
+    /* Failure */
+    if (nerrors) {
+        printf("total of %d errors out of %d elements\n", nerrors, NX*NY);
+        return 1;
+    }
+
+    PASSED();
+
+#else /*H5_HAVE_FILTER_SCALEOFFSET*/
+    SKIPPED();
+    puts(not_supported);
+#endif /*H5_HAVE_FILTER_SCALEOFFSET*/
+
+    TESTING("dataset of BE LONG LONG with scale-offset filter");
+
+#ifdef H5_HAVE_FILTER_SCALEOFFSET
+    /*
+     * Open the dataset with scale-offset filter.
+     */
+    if((dataset = H5Dopen2(file, DATASETNAME13, H5P_DEFAULT)) < 0)
         TEST_ERROR;
 
     /*
+     * Data and output buffer initialization.
+     */
+    for (j = 0; j < NX; j++) {
+        for (i = 0; i < NY; i++) {
+            int_data_in[j][i] = i + j;
+            int_data_out[j][i] = 0;
+        }
+    }
+    for (i = 0; i < NY; i++) {
+        int_data_in[NX][i] = -2;
+        int_data_out[NX][i] = 0;
+    }
+
+    /*
      * Read data from hyperslab in the file into the hyperslab in
      * memory and display.
      */
-    if(H5Dread(dataset, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, int_data_out) < 0)
+    if(H5Dread(dataset, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT,
+            int_data_out) < 0)
         TEST_ERROR;
 
     /* Check results */
-    for (j=0; j<NX; j++) {
+    for (j=0; j<(NX+1); j++) {
         for (i=0; i<NY; i++) {
             if (int_data_out[j][i] != int_data_in[j][i]) {
                 if (!nerrors++) {
                     H5_FAILED();
                     printf("element [%d][%d] is %d but should have been %d\n",
-                           j, i, int_data_out[j][i], int_data_in[j][i]);
+                           j, i, (int)int_data_out[j][i],
+                           (int)int_data_in[j][i]);
                 }
             }
         }
@@ -269,9 +892,8 @@ static int read_data(char *fname)
     /*
      * Close/release resources.
      */
-    H5Tclose(dt);
-    H5Tclose(datatype);
-    H5Dclose(dataset);
+    if(H5Dclose(dataset) < 0)
+        TEST_ERROR
 
     /* Failure */
     if (nerrors) {
@@ -286,7 +908,8 @@ static int read_data(char *fname)
     puts(not_supported);
 #endif /*H5_HAVE_FILTER_SCALEOFFSET*/
 
-    H5Fclose(file);
+    if(H5Fclose(file))
+        TEST_ERROR
     return 0;
 
 error: