ObjFW  Diff

Differences From Artifact [e0f523d409]:

• File src/OFDeflateStream.m — part of check-in [acc999a75e] at 2014-05-31 17:57:21 on branch trunk — OFStream: Add -[hasDataInReadBuffer].

  This replaces -[numberOfBytesInReadBuffer], as it's not always known how
  many bytes there are exactly and thus the number would often be wrong
  (e.g. because data is compressed). (user: js, size: 18896) [annotate] [blame] [check-ins using]

To Artifact [505e08ef0e]:

• File src/OFDeflateStream.m — part of check-in [13ee56edf3] at 2014-06-21 21:43:43 on branch trunk — Move all macros from OFObject.h to macros.h

  This means that OFObject.h imports macros.h now, making it unnecessary
  to manually import macros.h in almost every file. And while at it, also
  import autorelease.h in OFObject.h, so that this doesn't need to be
  manually imported in almost every file as well. (user: js, size: 18852) [annotate] [blame] [check-ins using]

32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

#import "OFDataArray.h"

#import "OFInitializationFailedException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfMemoryException.h"
#import "OFReadFailedException.h"

#import "autorelease.h"
#import "macros.h"

#define BLOCK_HEADER		  OF_DEFLATE_STREAM_BLOCK_HEADER
#define UNCOMPRESSED_BLOCK_HEADER OF_DEFLATE_STREAM_UNCOMPRESSED_BLOCK_HEADER
#define UNCOMPRESSED_BLOCK	  OF_DEFLATE_STREAM_UNCOMPRESSED_BLOCK
#define HUFFMAN_BLOCK		  OF_DEFLATE_STREAM_HUFFMAN_BLOCK
#define HUFFMAN_TREE		  OF_DEFLATE_STREAM_HUFFMAN_TREE
#define CONSTRUCT_CODELEN_TREE	  OF_DEFLATE_STREAM_CONSTRUCT_CODELEN_TREE
#define CONSTRUCT_LITLEN_TREE	  OF_DEFLATE_STREAM_CONSTRUCT_LITLEN_TREE

<
<
<

32
33
34
35
36
37
38



39
40
41
42
43
44
45

#import "OFDataArray.h"

#import "OFInitializationFailedException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfMemoryException.h"
#import "OFReadFailedException.h"




#define BLOCK_HEADER		  OF_DEFLATE_STREAM_BLOCK_HEADER
#define UNCOMPRESSED_BLOCK_HEADER OF_DEFLATE_STREAM_UNCOMPRESSED_BLOCK_HEADER
#define UNCOMPRESSED_BLOCK	  OF_DEFLATE_STREAM_UNCOMPRESSED_BLOCK
#define HUFFMAN_BLOCK		  OF_DEFLATE_STREAM_HUFFMAN_BLOCK
#define HUFFMAN_TREE		  OF_DEFLATE_STREAM_HUFFMAN_TREE
#define CONSTRUCT_CODELEN_TREE	  OF_DEFLATE_STREAM_CONSTRUCT_CODELEN_TREE
#define CONSTRUCT_LITLEN_TREE	  OF_DEFLATE_STREAM_CONSTRUCT_LITLEN_TREE