diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-03-11 18:36:10 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-03-11 18:36:10 (GMT) |
| commit | 85de8af63da9b0e7bd8c898323b94048afae0782 (patch) | |
| tree | f8b76cb097d07a26bd9c078c8bfee1d00994125c | |
| parent | 43869db5239e366e79d3909d9387cb7998cac1d6 (diff) | |
| download | hdf5-85de8af63da9b0e7bd8c898323b94048afae0782.zip hdf5-85de8af63da9b0e7bd8c898323b94048afae0782.tar.gz hdf5-85de8af63da9b0e7bd8c898323b94048afae0782.tar.bz2 | |
[svn-r16568] #1462 By selecting a compression type, a big endian byte order was being selected.
When reading the compression parameter keyword, the compression type read flag was incorrectly set to read, removed this line of code
in->configOptionVector[COMPRESS] = 1;
Modified one configuration file to have the COMPRESSION-TYPE GZIP
Keyword.
Entered a bug description fix of
- h5import: By selecting a compression type, a big endian byte order was being
selected (PVN - 2009/11/3)
tested: linux
| -rw-r--r-- | release_docs/RELEASE.txt | 3 | ||||
| -rwxr-xr-x | tools/h5import/h5import.c | 4 | ||||
| -rwxr-xr-x | tools/h5import/h5importtestutil.sh | 2 | ||||
| -rwxr-xr-x | tools/h5import/testfiles/txtin8.conf | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index dc02e46..13dcfab 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -123,6 +123,9 @@ New Features The size of the hyperslabs are defined as the size of each dimension or a predefined constant, whatever is smaller. This assures that the chunk read fits in the chunk cache. (PVN - 2008/11/21) + - h5import: By selecting a compression type, a big endian byte order was being + selected (PVN - 2009/11/3) + diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index 89d14f9..933754e 100755 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -1437,7 +1437,7 @@ processConfigurationFile(char *infile, struct Input *in, FILE **strm) if (in->configOptionVector[COMPRESS] == 0) in->compressionType = 0; - in->configOptionVector[COMPRESS] = 1; + break; case 12: /* EXTERNAL-STORAGE */ @@ -1990,7 +1990,7 @@ getCompressionType(struct Input *in, FILE** strm) return (-1); } - in->outputByteOrder = kindex; + in->compressionType = kindex; return (0); } diff --git a/tools/h5import/h5importtestutil.sh b/tools/h5import/h5importtestutil.sh index 18c9ef2..b02591b 100755 --- a/tools/h5import/h5importtestutil.sh +++ b/tools/h5import/h5importtestutil.sh @@ -66,7 +66,7 @@ TESTING "ASCII I16 rank 3 - Output LE - CHUNKED - extended" TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin16.conf -o txtin16.h5 -TESTING "ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed " +TESTING "ASCII I8 - rank 3 - Output I8 Chunked+Extended+Compressed " TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5 TESTING "ASCII UI32 - rank 3 - Output BE" diff --git a/tools/h5import/testfiles/txtin8.conf b/tools/h5import/testfiles/txtin8.conf index 4405338..350d18a 100755 --- a/tools/h5import/testfiles/txtin8.conf +++ b/tools/h5import/testfiles/txtin8.conf @@ -3,13 +3,13 @@ INPUT-CLASS TEXTIN INPUT-SIZE 8 OUTPUT-CLASS IN OUTPUT-SIZE 8 -OUTPUT-BYTE-ORDER LE -OUTPUT-ARCHITECTURE STD RANK 3 DIMENSION-SIZES 2 4 3 CHUNKED-DIMENSION-SIZES 2 2 2 MAXIMUM-DIMENSIONS -1 -1 -1 COMPRESSION-PARAM 3 +COMPRESSION-TYPE GZIP + |