Differences From Artifact [f1be19a9ae]:
- File src/OFLHAArchive.m — part of check-in [6cbc2253b8] at 2018-06-03 18:15:06 on branch trunk — OFLHAArchive: Support for -lh[4567]- compression (user: js, size: 18256) [annotate] [blame] [check-ins using]
To Artifact [9530d9435c]:
- File
src/OFLHAArchive.m
— part of check-in
[44413ada84]
at
2018-06-03 20:11:18
on branch trunk
— Work around GCC being extremely buggy
This includes GCC thinking uint16_t and uint_fast16_t have a different
signedness and pointers to subclasses of OFStream and pointers to
OFStream being incompatible pointer types. (user: js, size: 18221) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
252 253 254 255 256 257 258 |
entry: _lastEntry];
return [[_lastEntry copy] autorelease];
}
- (OFStream <OFReadyForReadingObserving> *)streamForReadingCurrentEntry
{
| < < < < | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
entry: _lastEntry];
return [[_lastEntry copy] autorelease];
}
- (OFStream <OFReadyForReadingObserving> *)streamForReadingCurrentEntry
{
if (_lastReturnedStream == nil)
@throw [OFInvalidArgumentException exception];
return [[_lastReturnedStream retain] autorelease];
}
- (void)close
{
if (_stream == nil)
return;
|
| ︙ | ︙ | |||
451 452 453 454 455 456 457 |
_treeIter = _codeLenTree;
_state = STATE_LITLEN_TREE;
goto start;
case STATE_LITLEN_TREE:
while (_codesReceived < _codesCount) {
if OF_UNLIKELY (_skip) {
| | | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 |
_treeIter = _codeLenTree;
_state = STATE_LITLEN_TREE;
goto start;
case STATE_LITLEN_TREE:
while (_codesReceived < _codesCount) {
if OF_UNLIKELY (_skip) {
uint16_t skipCount;
switch (_codesLengths[_codesReceived]) {
case 0:
skipCount = 1;
break;
case 1:
if OF_UNLIKELY (!tryReadBits(self,
|
| ︙ | ︙ | |||
480 481 482 483 484 485 486 | } if OF_UNLIKELY (_codesReceived + skipCount > _codesCount) @throw [OFInvalidFormatException exception]; | | | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 | } if OF_UNLIKELY (_codesReceived + skipCount > _codesCount) @throw [OFInvalidFormatException exception]; for (uint_fast16_t j = 0; j < skipCount; j++) _codesLengths[_codesReceived++] = 0; _skip = false; continue; } if (!of_huffman_tree_walk(self, tryReadBits, |
| ︙ | ︙ | |||
678 679 680 681 682 683 684 685 686 687 688 689 690 691 |
_symbolsLeft--;
_treeIter = _litLenTree;
_state = STATE_BLOCK_LITLEN;
goto start;
}
}
- (bool)lowlevelIsAtEndOfStream
{
if (_stream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
| > > | 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 |
_symbolsLeft--;
_treeIter = _litLenTree;
_state = STATE_BLOCK_LITLEN;
goto start;
}
OF_UNREACHABLE
}
- (bool)lowlevelIsAtEndOfStream
{
if (_stream == nil)
@throw [OFNotOpenException exceptionWithObject: self];
|
| ︙ | ︙ |