Commit 7a93396

committed

Tweaked C++ BitInputStream class in case EOF is not -1.

1 parent f6744d9 commit 7a93396Copy full SHA for 7a93396

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ BitInputStream::BitInputStream(std::istream &in) :`
`18`	`18`
`19`	`19`
`20`	`20`	`int BitInputStream::read() {`
`21`		`- if (currentByte == -1)`
	`21`	`+ if (currentByte == EOF)`
`22`	`22`	`return -1;`
`23`	`23`	`if (numBitsRemaining == 0) {`
`24`	`24`	`currentByte = input.get(); // Note: istream.get() returns int, not char`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class BitInputStream final {`
`23`	`23`	`// The underlying byte stream to read from.`
`24`	`24`	`private: std::istream &input;`
`25`	`25`
`26`		`- // Either in the range [0x00, 0xFF] if bits are available, or -1 if end of stream is reached.`
	`26`	`+ // Either in the range [0x00, 0xFF] if bits are available, or EOF if end of stream is reached.`
`27`	`27`	`private: int currentByte;`
`28`	`28`
`29`	`29`	`// Number of remaining bits in the current byte, always between 0 and 7 (inclusive).`

Comments

(0)