update Java version

Author: peteroupc

src/main/java/com/upokecenter/cbor/CBORObject.java

@@ -5837,7 +5837,9 @@ public static int WriteFloatingPointBits(
           }
         } else if (byteCount == 4) {
           int bits =
-            CBORUtilities.SingleToHalfPrecisionIfSameValue(floatingBits);
+
+            CBORUtilities.SingleToHalfPrecisionIfSameValue(
+              ((int)floatingBits));
           if (bits != -1) {
             return WriteFloatingPointBits(outputStream, bits, 2, false);
           }

src/main/java/com/upokecenter/cbor/CBORUtilities.java

@@ -1604,8 +1604,7 @@ public static int DoubleToRoundedSinglePrecision(long bits) {
       }
     }
 
-    public static int SingleToHalfPrecisionIfSameValue(float f) {
-      int bits = Float.floatToRawIntBits(f);
+    public static int SingleToHalfPrecisionIfSameValue(int bits) {
       int exp = (bits >> 23) & 0xff;
       int mant = bits & 0x7fffff;
       int sign = (bits >> 16) & 0x8000;

src/test/java/com/upokecenter/test/CBORObjectTest.java

@@ -7800,6 +7800,65 @@ public static void TestWriteExtraOne(long longValue) {
       }
     }
 
+    private void TestWriteUnchangedFloatBits(int bits) {
+          {
+            java.io.ByteArrayOutputStream ms = null;
+try {
+ms = new java.io.ByteArrayOutputStream();
+
+            byte[] expectedBytes = {
+              (byte)0xfa,
+              (byte)((bits >> 24) & 0xff),
+              (byte)((bits >> 16) & 0xff),
+              (byte)((bits >> 8) & 0xff),
+              (byte)(bits & 0xff)
+             };
+            CBORObject.WriteFloatingPointBits(ms, bits, 4, true);
+            TestCommon.AssertByteArraysEqual(expectedBytes, ms.toByteArray());
+}
+finally {
+try { if (ms != null) { ms.close(); } } catch (java.io.IOException ex) {}
+}
+}
+    }
+
+    private void TestWriteUnchangedDoubleBits(long bits) {
+          {
+            java.io.ByteArrayOutputStream ms = null;
+try {
+ms = new java.io.ByteArrayOutputStream();
+
+            byte[] expectedBytes = {
+              (byte)0xfb,
+              (byte)((bits >> 56) & 0xffL),
+              (byte)((bits >> 48) & 0xffL),
+              (byte)((bits >> 40) & 0xffL),
+              (byte)((bits >> 32) & 0xffL),
+              (byte)((bits >> 24) & 0xffL),
+              (byte)((bits >> 16) & 0xffL),
+              (byte)((bits >> 8) & 0xffL),
+              (byte)(bits & 0xffL)
+             };
+            CBORObject.WriteFloatingPointBits(ms, bits, 8, true);
+            TestCommon.AssertByteArraysEqual(expectedBytes, ms.toByteArray());
+}
+finally {
+try { if (ms != null) { ms.close(); } } catch (java.io.IOException ex) {}
+}
+}
+    }
+
+    @Test
+    public void TestWriteSubnormalFloat() {
+      for (int i = 1; i <= 0x1fff; ++i) {
+          this.TestWriteUnchangedFloatBits(i);
+          this.TestWriteUnchangedFloatBits(0x2000 + i);
+          this.TestWriteUnchangedFloatBits(0x4000 + i);
+          this.TestWriteUnchangedFloatBits(0x8000 + i);
+          this.TestWriteUnchangedDoubleBits((long)i);
+      }
+    }
+
     @Test
     public void TestWriteExtra() {
       try {