From: Yann Collet Date: Sat, 23 Jul 2016 13:52:05 +0000 (+0200) Subject: changed enccoding type order : raw, rle, compressed, repeat-stats X-Git-Tag: v0.8.0^2~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=571a59034a243709bee0af52aaa211292d892ae4;p=thirdparty%2Fzstd.git changed enccoding type order : raw, rle, compressed, repeat-stats --- diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h index 43cbc9a3a..f51def2b8 100644 --- a/lib/common/zstd_internal.h +++ b/lib/common/zstd_internal.h @@ -88,7 +88,7 @@ static const size_t ZSTD_did_fieldSize[4] = { 0, 1, 2, 4 }; #define ZSTD_BLOCKHEADERSIZE 3 /* C standard doesn't allow `static const` variable to be init using another `static const` variable */ static const size_t ZSTD_blockHeaderSize = ZSTD_BLOCKHEADERSIZE; -typedef enum { bt_compressed, bt_raw, bt_rle, bt_end } blockType_t; +typedef enum { bt_raw, bt_rle, bt_compressed, bt_end } blockType_t; #define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */ #define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */) /* for a non-null block */ diff --git a/zstd_compression_format.md b/zstd_compression_format.md index 42fe3e0c4..7112fa152 100644 --- a/zstd_compression_format.md +++ b/zstd_compression_format.md @@ -324,9 +324,9 @@ while the remaining 22 bits represent the (compressed) block size. There are 4 block types : -| Value | 0 | 1 | 2 | 3 | -| ---------- | ---------- | --- | --- | ------- | -| Block Type | Compressed | Raw | RLE | EndMark | +| Value | 0 | 1 | 2 | 3 | +| ---------- | --- | --- | ---------- | ------- | +| Block Type | Raw | RLE | Compressed | EndMark | - Compressed : this is a [Zstandard compressed block](#compressed-block-format), detailed in another section of this specification.