Fixed KLVInputStream::readUnsignedInt()

#162

Author: palemieux

src/main/java/com/sandflow/smpte/klv/KLVInputStream.java

@@ -283,7 +283,7 @@ public long readUnsignedInt() throws IOException, EOFException {
 
         if (byteorder == ByteOrder.BIG_ENDIAN) {
 
-            return ((long) dis.readInt()) & 0xFFFF;
+            return ((long) dis.readInt()) & 0xFFFFFFFF;
 
         } else {
 
@@ -292,7 +292,7 @@ public long readUnsignedInt() throws IOException, EOFException {
             int b2 = readUnsignedByte();
             int b3 = readUnsignedByte();
 
-            return ((long) b0 + (b1 << 8) + (b2 << 16) + (b3 << 24)) & 0xFFFF;
+            return ((long) b0 + (b1 << 8) + (b2 << 16) + (b3 << 24)) & 0xFFFFFFFF;
 
         }
 

src/test/java/com/sandflow/smpte/klv/KLVInputStreamTest.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) Sandflow Consulting, LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+* @author Pierre-Anthony Lemieux
+*/
+
+package com.sandflow.smpte.klv;
+
+import java.io.ByteArrayInputStream;
+
+import junit.framework.TestCase;
+
+public class KLVInputStreamTest extends TestCase {
+
+  public KLVInputStreamTest(String testName) {
+    super(testName);
+  }
+
+  public void testReadLong() throws Exception {
+    byte[] NEG_ONE = new byte[] { (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
+        (byte) 0xFF, (byte) 0xFF };
+    KLVInputStream kis = new KLVInputStream(new ByteArrayInputStream(NEG_ONE));
+    assertEquals(-1L, kis.readLong());
+  }
+
+  public void testReadUnsignedByte() throws Exception {
+    KLVInputStream kis = new KLVInputStream(new ByteArrayInputStream(new byte[] { (byte) 0xFF }));
+    assertEquals(255, kis.readUnsignedByte());
+  }
+
+}