mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r16568] #1462 By selecting a compression type, a big endian byte order was being selected.

Browse Source 
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
This commit is contained in:
Pedro Vicente Nunes 2009-03-11 13:36:10 -05:00
parent 43869db523
commit 85de8af63d
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release_docs/RELEASE.txt
View File

@ -123,6 +123,9 @@ New Features
The size of the hyperslabs are defined as the size of each dimension or a 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 predefined constant, whatever is smaller. This assures that the chunk
read fits in the chunk cache. (PVN - 2008/11/21) 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)

4
tools/h5import/h5import.c
View File

@ -1437,7 +1437,7 @@ processConfigurationFile(char *infile, struct Input *in, FILE **strm)
if (in->configOptionVector[COMPRESS] == 0) if (in->configOptionVector[COMPRESS] == 0)
in->compressionType = 0; in->compressionType = 0;
in->configOptionVector[COMPRESS] = 1;
break; break;
case 12: /* EXTERNAL-STORAGE */ case 12: /* EXTERNAL-STORAGE */
@ -1990,7 +1990,7 @@ getCompressionType(struct Input *in, FILE** strm)
return (-1); return (-1);
} }
in->outputByteOrder = kindex; in->compressionType = kindex;
return (0); return (0);
} }

2
tools/h5import/h5importtestutil.sh
View File

@ -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 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 TOOLTEST $srcdir/testfiles/txtin16.txt -c $srcdir/testfiles/txtin8.conf -o txtin8.h5
TESTING "ASCII UI32 - rank 3 - Output BE" TESTING "ASCII UI32 - rank 3 - Output BE"

4
tools/h5import/testfiles/txtin8.conf
View File

@ -3,13 +3,13 @@ INPUT-CLASS TEXTIN
INPUT-SIZE 8 INPUT-SIZE 8
OUTPUT-CLASS IN OUTPUT-CLASS IN
OUTPUT-SIZE 8 OUTPUT-SIZE 8
OUTPUT-BYTE-ORDER LE
OUTPUT-ARCHITECTURE STD
RANK 3 RANK 3
DIMENSION-SIZES 2 4 3 DIMENSION-SIZES 2 4 3
CHUNKED-DIMENSION-SIZES 2 2 2 CHUNKED-DIMENSION-SIZES 2 2 2
MAXIMUM-DIMENSIONS -1 -1 -1 MAXIMUM-DIMENSIONS -1 -1 -1
COMPRESSION-PARAM 3 COMPRESSION-PARAM 3
COMPRESSION-TYPE GZIP