Differences From Artifact [4f8a23b8a4]:
- File
src/OFZIPArchive.m
— part of check-in
[f9cd4f9cab]
at
2017-06-05 15:51:48
on branch trunk
— OFStream: Don't throw when at end of stream
Instead, let reads return 0 and let writes append after the end. (user: js, size: 13823) [annotate] [blame] [check-ins using]
To Artifact [1d8f8c26f4]:
- File
src/OFZIPArchive.m
— part of check-in
[f56a50ee50]
at
2017-06-10 10:00:12
on branch trunk
— Rename OFDeflateStream back to OFInflateStream
There is not much point in having a bi-directional stream for Deflate
compression / decompression. (user: js, size: 13823) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFDataArray.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFSeekableStream.h" #ifdef OF_HAVE_FILES # import "OFFile.h" #endif | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #import "OFDataArray.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFSeekableStream.h" #ifdef OF_HAVE_FILES # import "OFFile.h" #endif #import "OFInflateStream.h" #import "OFInflate64Stream.h" #import "crc32.h" #import "OFChecksumFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFNotImplementedException.h" |
| ︙ | ︙ | |||
461 462 463 464 465 466 467 |
_stream = [stream retain];
switch (localFileHeader->_compressionMethod) {
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_NONE:
_decompressedStream = [stream retain];
break;
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_DEFLATE:
| | | | 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 |
_stream = [stream retain];
switch (localFileHeader->_compressionMethod) {
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_NONE:
_decompressedStream = [stream retain];
break;
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_DEFLATE:
_decompressedStream = [[OFInflateStream alloc]
initWithStream: stream];
break;
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_DEFLATE64:
_decompressedStream = [[OFInflate64Stream alloc]
initWithStream: stream];
break;
default:
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
}
|
| ︙ | ︙ |