X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fdata%2FBitInputStream.java;h=a6ac69136a9b1103d8b3a2d24dd8a3b5d829b742;hp=5769eafd716613ed56f70fb45aef90c2c0c3396a;hb=9bf004ce4e9b5edff36c65fcc8cc0f303390d7fc;hpb=afaa928dd10304ee3e8e6bad3a377ced6a7b2f42 diff --git a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java index 5769eaf..a6ac691 100755 --- a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java +++ b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java @@ -18,38 +18,37 @@ import java.io.InputStream; public class BitInputStream { - int currentByte; - int currentBytePointer = -1; + private final InputStream inputStream; + private int currentByte; + private int currentBytePointer = -1; - InputStream inputStream; + public BitInputStream(final InputStream inputStream) { + this.inputStream = inputStream; + } - public BitInputStream(final InputStream inputStream) { - this.inputStream = inputStream; - } + public int readBits(final int bitCount) throws IOException { - public int readBits(final int bitCount) throws IOException { + int readableByte = 0; + for (int i = 0; i < bitCount; i++) { - int readableByte = 0; - for (int i = 0; i < bitCount; i++) { + readableByte = readableByte << 1; - readableByte = readableByte << 1; + if (currentBytePointer == -1) { + currentBytePointer = 7; + currentByte = inputStream.read(); + } - if (currentBytePointer == -1) { - currentBytePointer = 7; - currentByte = inputStream.read(); - } + int mask = 1; + mask = mask << currentBytePointer; - int mask = 1; - mask = mask << currentBytePointer; + final int currentBit = currentByte & mask; - final int currentBit = currentByte & mask; + if (currentBit != 0) + readableByte = readableByte | 1; - if (currentBit != 0) - readableByte = readableByte | 1; - - currentBytePointer--; - } - return readableByte; - } + currentBytePointer--; + } + return readableByte; + } }