Differences From Artifact [b46dd90f88]:
- File src/OFDeflateStream.m — part of check-in [a427cfc86a] at 2013-10-29 23:46:33 on branch trunk — Clean up OF_ENSURE() vs. assert() a little. (user: js, size: 17543) [annotate] [blame] [check-ins using]
To Artifact [4e0c067ee9]:
- File src/OFDeflateStream.m — part of check-in [7aef43d648] at 2013-11-06 20:29:17 on branch trunk — Add OFDeflate64Stream. (user: js, size: 18123) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
53 54 55 56 57 58 59 60 61 62 63 64 65 66 |
#define MAX_BITS 15
struct huffman_tree {
struct huffman_tree *leafs[2];
uint16_t value;
};
static const uint8_t lengthCodes[29] = {
/* indices are -257, values -3 */
0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
64, 80, 96, 112, 128, 160, 192, 224, 255
};
static const uint8_t lengthExtraBits[29] = {
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4,
| > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
#define MAX_BITS 15
struct huffman_tree {
struct huffman_tree *leafs[2];
uint16_t value;
};
static const uint_fast8_t numDistanceCodes = 30;
static const uint8_t lengthCodes[29] = {
/* indices are -257, values -3 */
0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
64, 80, 96, 112, 128, 160, 192, 224, 255
};
static const uint8_t lengthExtraBits[29] = {
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4,
|
| ︙ | ︙ | |||
272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 |
- initWithStream: (OFStream*)stream
{
self = [super init];
_stream = [stream retain];
_bitIndex = 8; /* 0-7 address the bit, 8 means fetch next byte */
return self;
}
- (void)dealloc
{
[_stream release];
[super dealloc];
}
- (size_t)lowlevelReadIntoBuffer: (void*)buffer_
length: (size_t)length
{
uint8_t *buffer = buffer_;
uint_fast16_t bits;
uint16_t value;
size_t i, tmp, bytesWritten = 0;
| > > > > > > | | 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 |
- initWithStream: (OFStream*)stream
{
self = [super init];
_stream = [stream retain];
_bitIndex = 8; /* 0-7 address the bit, 8 means fetch next byte */
_slidingWindowMask = 0x7FFF;
_codes.numDistanceCodes = numDistanceCodes;
_codes.lengthCodes = lengthCodes;
_codes.lengthExtraBits = lengthExtraBits;
_codes.distanceCodes = distanceCodes;
_codes.distanceExtraBits = distanceExtraBits;
return self;
}
- (void)dealloc
{
[_stream release];
[super dealloc];
}
- (size_t)lowlevelReadIntoBuffer: (void*)buffer_
length: (size_t)length
{
uint8_t *buffer = buffer_;
uint_fast16_t bits;
uint16_t value;
size_t i, tmp, bytesWritten = 0;
uint8_t *slidingWindow;
uint_fast16_t slidingWindowIndex;
if (_atEndOfStream)
@throw [OFReadFailedException exceptionWithStream: self
requestedLength: length];
start:
|
| ︙ | ︙ | |||
384 385 386 387 388 389 390 |
tmp = (length < CTX.length - CTX.position
? length : CTX.length - CTX.position);
tmp = [_stream readIntoBuffer: buffer + bytesWritten
length: tmp];
if OF_UNLIKELY (_slidingWindow == NULL) {
| | > | | > | 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 |
tmp = (length < CTX.length - CTX.position
? length : CTX.length - CTX.position);
tmp = [_stream readIntoBuffer: buffer + bytesWritten
length: tmp];
if OF_UNLIKELY (_slidingWindow == NULL) {
_slidingWindow =
[self allocMemoryWithSize: _slidingWindowMask + 1];
/* Avoid leaking data */
memset(_slidingWindow, 0, _slidingWindowMask + 1);
}
slidingWindow = _slidingWindow;
slidingWindowIndex = _slidingWindowIndex;
for (i = 0; i < tmp; i++) {
slidingWindow[slidingWindowIndex] =
buffer[bytesWritten + i];
slidingWindowIndex = (slidingWindowIndex + 1) &
_slidingWindowMask;
}
_slidingWindowIndex = slidingWindowIndex;
length -= tmp;
bytesWritten += tmp;
CTX.position += tmp;
|
| ︙ | ︙ | |||
570 571 572 573 574 575 576 |
return bytesWritten;
buffer[bytesWritten++] = CTX.value;
length--;
if (_slidingWindow == NULL) {
_slidingWindow = [self
| | > | > | > | 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 |
return bytesWritten;
buffer[bytesWritten++] = CTX.value;
length--;
if (_slidingWindow == NULL) {
_slidingWindow = [self
allocMemoryWithSize:
_slidingWindowMask + 1];
/* Avoid leaking data */
memset(_slidingWindow, 0,
_slidingWindowMask + 1);
}
_slidingWindow[_slidingWindowIndex] = CTX.value;
_slidingWindowIndex =
(_slidingWindowIndex + 1) &
_slidingWindowMask;
CTX.state = AWAIT_CODE;
CTX.treeIter = CTX.litLenTree;
}
if OF_UNLIKELY (CTX.state == AWAIT_LENGTH_EXTRA_BITS) {
if OF_UNLIKELY (!tryReadBits(self, &bits,
|
| ︙ | ︙ | |||
600 601 602 603 604 605 606 |
/* Distance of length distance pair */
if (CTX.state == AWAIT_DISTANCE) {
if OF_UNLIKELY (!walkTree(self, &CTX.treeIter,
&value))
return bytesWritten;
| | > | | | 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 |
/* Distance of length distance pair */
if (CTX.state == AWAIT_DISTANCE) {
if OF_UNLIKELY (!walkTree(self, &CTX.treeIter,
&value))
return bytesWritten;
if OF_UNLIKELY (value >=
_codes.numDistanceCodes)
@throw [OFInvalidFormatException
exception];
CTX.distance = _codes.distanceCodes[value];
extraBits = _codes.distanceExtraBits[value];
if (extraBits > 0) {
if OF_UNLIKELY (!tryReadBits(self,
&bits, extraBits)) {
CTX.state =
AWAIT_DISTANCE_EXTRA_BITS;
CTX.extraBits = extraBits;
|
| ︙ | ︙ | |||
647 648 649 650 651 652 653 |
if OF_UNLIKELY (length == 0) {
CTX.length -= j;
return bytesWritten;
}
index = (_slidingWindowIndex -
| | | > | 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 |
if OF_UNLIKELY (length == 0) {
CTX.length -= j;
return bytesWritten;
}
index = (_slidingWindowIndex -
CTX.distance) & _slidingWindowMask;
value = _slidingWindow[index];
buffer[bytesWritten++] = value;
length--;
_slidingWindow[_slidingWindowIndex] =
value;
_slidingWindowIndex =
(_slidingWindowIndex + 1) &
_slidingWindowMask;
}
CTX.state = AWAIT_CODE;
CTX.treeIter = CTX.litLenTree;
}
if OF_UNLIKELY (!walkTree(self, &CTX.treeIter, &value))
|
| ︙ | ︙ | |||
690 691 692 693 694 695 696 |
}
buffer[bytesWritten++] = value;
length--;
if (_slidingWindow == NULL) {
_slidingWindow = [self
| | > | > | > | | | 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 |
}
buffer[bytesWritten++] = value;
length--;
if (_slidingWindow == NULL) {
_slidingWindow = [self
allocMemoryWithSize:
_slidingWindowMask + 1];
/* Avoid leaking data */
memset(_slidingWindow, 0,
_slidingWindowMask + 1);
}
_slidingWindow[_slidingWindowIndex] = value;
_slidingWindowIndex =
(_slidingWindowIndex + 1) &
_slidingWindowMask;
CTX.treeIter = CTX.litLenTree;
continue;
}
if OF_UNLIKELY (value > 285)
@throw [OFInvalidFormatException exception];
/* Length of length distance pair */
lengthCodeIndex = value - 257;
CTX.length = _codes.lengthCodes[lengthCodeIndex] + 3;
extraBits = _codes.lengthExtraBits[lengthCodeIndex];
if (extraBits > 0) {
if OF_UNLIKELY (!tryReadBits(self, &bits,
extraBits)) {
CTX.extraBits = extraBits;
CTX.state = AWAIT_LENGTH_EXTRA_BITS;
return bytesWritten;
|
| ︙ | ︙ |