X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fdata%2FBitInputStream.java;h=a6ac69136a9b1103d8b3a2d24dd8a3b5d829b742;hb=9bf004ce4e9b5edff36c65fcc8cc0f303390d7fc;hp=6564417bfa6dc4c9c5c0a997f884936b554a9d52;hpb=cf965fda534cc562368c9f2a3f34475e2519fcdc;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
index 6564417..a6ac691 100755
--- a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
+++ b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
@@ -1,10 +1,10 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2013, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
  */
 
 package eu.svjatoslav.commons.data;
@@ -18,45 +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;
-	}
-
-	public int readIntegerCompressed8() throws IOException {
-		if (readBits(1) == 0)
-			return readBits(8);
-		else
-			return readBits(32);
-	}
+            currentBytePointer--;
+        }
+        return readableByte;
+    }
 
 }