ObjFW  Diff

Differences From Artifact [28d4702177]:

To Artifact [a61e69ad62]:


14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
14
15
16
17
18
19
20


21
22
23
24
25
26
27







-
-







 */

#include "config.h"

#include <stdlib.h>
#include <string.h>

#include <assert.h>

#ifndef OF_INFLATE64_STREAM_M
# import "OFInflateStream.h"
#else
# import "OFInflate64Stream.h"
# define OFInflateStream OFInflate64Stream
#endif
#import "OFHuffmanTree.h"
103
104
105
106
107
108
109
110

111
112
113
114
115
116
117
101
102
103
104
105
106
107

108
109
110
111
112
113
114
115







-
+








@implementation OFInflateStream
static OF_INLINE bool
tryReadBits(OFInflateStream *stream, uint16_t *bits, uint8_t count)
{
	uint16_t ret = stream->_savedBits;

	assert(stream->_savedBitsLength < count);
	OFAssert(stream->_savedBitsLength < count);

	for (uint_fast8_t i = stream->_savedBitsLength; i < count; i++) {
		if OF_UNLIKELY (stream->_bitIndex == 8) {
			if OF_LIKELY (stream->_bufferIndex <
			    stream->_bufferLength)
				stream->_byte =
				    stream->_buffer[stream->_bufferIndex++];