| bzlib_private.h (167974) | bzlib_private.h (177420) |
|---|---|
| 1 2/*-------------------------------------------------------------*/ 3/*--- Private header file for the library. ---*/ 4/*--- bzlib_private.h ---*/ 5/*-------------------------------------------------------------*/ 6 7/* ------------------------------------------------------------------ 8 This file is part of bzip2/libbzip2, a program and library for 9 lossless, block-sorting data compression. 10 | 1 2/*-------------------------------------------------------------*/ 3/*--- Private header file for the library. ---*/ 4/*--- bzlib_private.h ---*/ 5/*-------------------------------------------------------------*/ 6 7/* ------------------------------------------------------------------ 8 This file is part of bzip2/libbzip2, a program and library for 9 lossless, block-sorting data compression. 10 |
| 11 bzip2/libbzip2 version 1.0.4 of 20 December 2006 12 Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> | 11 bzip2/libbzip2 version 1.0.5 of 10 December 2007 12 Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> |
| 13 14 Please read the WARNING, DISCLAIMER and PATENTS sections in the 15 README file. 16 17 This program is released under the terms of the license contained 18 in the file LICENSE. 19 ------------------------------------------------------------------ */ 20 --- 10 unchanged lines hidden (view full) --- 31#endif 32 33#include "bzlib.h" 34 35 36 37/*-- General stuff. --*/ 38 | 13 14 Please read the WARNING, DISCLAIMER and PATENTS sections in the 15 README file. 16 17 This program is released under the terms of the license contained 18 in the file LICENSE. 19 ------------------------------------------------------------------ */ 20 --- 10 unchanged lines hidden (view full) --- 31#endif 32 33#include "bzlib.h" 34 35 36 37/*-- General stuff. --*/ 38 |
| 39#define BZ_VERSION "1.0.4, 20-Dec-2006" | 39#define BZ_VERSION "1.0.5, 10-Dec-2007" |
| 40 41typedef char Char; 42typedef unsigned char Bool; 43typedef unsigned char UChar; 44typedef int Int32; 45typedef unsigned int UInt32; 46typedef short Int16; 47typedef unsigned short UInt16; --- 389 unchanged lines hidden (view full) --- 437 } 438 DState; 439 440 441 442/*-- Macros for decompression. --*/ 443 444#define BZ_GET_FAST(cccc) \ | 40 41typedef char Char; 42typedef unsigned char Bool; 43typedef unsigned char UChar; 44typedef int Int32; 45typedef unsigned int UInt32; 46typedef short Int16; 47typedef unsigned short UInt16; --- 389 unchanged lines hidden (view full) --- 437 } 438 DState; 439 440 441 442/*-- Macros for decompression. --*/ 443 444#define BZ_GET_FAST(cccc) \ |
| 445 /* c_tPos is unsigned, hence test < 0 is pointless. */ \ 446 if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ |
|
| 445 s->tPos = s->tt[s->tPos]; \ 446 cccc = (UChar)(s->tPos & 0xff); \ 447 s->tPos >>= 8; 448 449#define BZ_GET_FAST_C(cccc) \ | 447 s->tPos = s->tt[s->tPos]; \ 448 cccc = (UChar)(s->tPos & 0xff); \ 449 s->tPos >>= 8; 450 451#define BZ_GET_FAST_C(cccc) \ |
| 452 /* c_tPos is unsigned, hence test < 0 is pointless. */ \ 453 if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ |
|
| 450 c_tPos = c_tt[c_tPos]; \ 451 cccc = (UChar)(c_tPos & 0xff); \ 452 c_tPos >>= 8; 453 454#define SET_LL4(i,n) \ 455 { if (((i) & 0x1) == 0) \ 456 s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ 457 s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ --- 6 unchanged lines hidden (view full) --- 464 { s->ll16[i] = (UInt16)(n & 0x0000ffff); \ 465 SET_LL4(i, n >> 16); \ 466 } 467 468#define GET_LL(i) \ 469 (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) 470 471#define BZ_GET_SMALL(cccc) \ | 454 c_tPos = c_tt[c_tPos]; \ 455 cccc = (UChar)(c_tPos & 0xff); \ 456 c_tPos >>= 8; 457 458#define SET_LL4(i,n) \ 459 { if (((i) & 0x1) == 0) \ 460 s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ 461 s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ --- 6 unchanged lines hidden (view full) --- 468 { s->ll16[i] = (UInt16)(n & 0x0000ffff); \ 469 SET_LL4(i, n >> 16); \ 470 } 471 472#define GET_LL(i) \ 473 (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) 474 475#define BZ_GET_SMALL(cccc) \ |
| 472 cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ 473 s->tPos = GET_LL(s->tPos); | 476 /* c_tPos is unsigned, hence test < 0 is pointless. */ \ 477 if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ 478 cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ 479 s->tPos = GET_LL(s->tPos); |
| 474 475 476/*-- externs for decompression. --*/ 477 478extern Int32 479BZ2_indexIntoF ( Int32, Int32* ); 480 481extern Int32 --- 22 unchanged lines hidden --- | 480 481 482/*-- externs for decompression. --*/ 483 484extern Int32 485BZ2_indexIntoF ( Int32, Int32* ); 486 487extern Int32 --- 22 unchanged lines hidden --- |