Differences From Artifact [6dcb1199a3]:
- File src/OFInflateStream.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: 16503) [annotate] [blame] [check-ins using]
To Artifact [cd213df087]:
- File
src/OFInflateStream.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: 16493) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
375 376 377 378 379 380 381 |
}
if OF_LIKELY (CTX.lengths == NULL) {
CTX.lengths = [self allocMemoryWithSize: 19];
memset(CTX.lengths, 0, 19);
}
| | | 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 |
}
if OF_LIKELY (CTX.lengths == NULL) {
CTX.lengths = [self allocMemoryWithSize: 19];
memset(CTX.lengths, 0, 19);
}
for (uint16_t i = CTX.receivedCount;
i < CTX.codeLenCodesCount + 4; i++) {
if OF_UNLIKELY (!tryReadBits(self, &bits, 3)) {
CTX.receivedCount = i;
return bytesWritten;
}
CTX.lengths[codeLengthsOrder[i]] = bits;
|
| ︙ | ︙ | |||
399 400 401 402 403 404 405 | CTX.value = 0xFF; } if OF_LIKELY (CTX.lengths == NULL) CTX.lengths = [self allocMemoryWithSize: CTX.litLenCodesCount + CTX.distCodesCount + 258]; | | | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 |
CTX.value = 0xFF;
}
if OF_LIKELY (CTX.lengths == NULL)
CTX.lengths = [self allocMemoryWithSize:
CTX.litLenCodesCount + CTX.distCodesCount + 258];
for (uint16_t i = CTX.receivedCount;
i < CTX.litLenCodesCount + CTX.distCodesCount + 258;) {
uint8_t j, count;
if OF_LIKELY (CTX.value == 0xFF) {
if OF_UNLIKELY (!of_huffman_tree_walk(self,
tryReadBits, &CTX.treeIter, &value)) {
CTX.receivedCount = i;
|
| ︙ | ︙ |