PatchSet 6879
Date: 2005/09/07 16:03:25
Author: kaz
Branch: HEAD
Tag: (none)
Log:
2005-09-03 Ito Kazumitsu <[EMAIL PROTECTED]>
* libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:
Changed the byte mask 0x00FF to 0xFF, conforming to GNU Classpath.
Members:
ChangeLog:1.4400->1.4401
libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:1.7->1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4400 kaffe/ChangeLog:1.4401
--- kaffe/ChangeLog:1.4400 Sat Sep 3 09:30:18 2005
+++ kaffe/ChangeLog Wed Sep 7 16:03:25 2005
@@ -1,3 +1,8 @@
+2005-09-03 Ito Kazumitsu <[EMAIL PROTECTED]>
+
+ * libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:
+ Changed the byte mask 0x00FF to 0xFF, conforming to GNU Classpath.
+
2005-09-03 Guilhem Lavaux <[EMAIL PROTECTED]>
* config/powerpc/jit3-powerpc.def: Debugging is now enabled by default
Index: kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java
diff -u kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:1.7
kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:1.8
--- kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java:1.7 Sat Aug
13 21:45:47 2005
+++ kaffe/libraries/javalib/gnu/java/nio/charset/UTF_16Decoder.java Wed Sep
7 16:03:26 2005
@@ -87,7 +87,7 @@
byteOrder == MAYBE_BIG_ENDIAN ||
byteOrder == MAYBE_LITTLE_ENDIAN)
{
- char c = (char) (((b1 & 0x00FF) << 8) | (b2 & 0x00FF));
+ char c = (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF));
if (c == BYTE_ORDER_MARK)
{
if (byteOrder == MAYBE_LITTLE_ENDIAN)
@@ -118,9 +118,9 @@
}
// FIXME: Change so you only do a single comparison here.
- char c = byteOrder == BIG_ENDIAN ?
- (char) (((b1 & 0x00FF) << 8) | (b2 & 0x00FF)) :
- (char) (((b2 & 0x00FF) << 8) | (b1 & 0X00FF));
+ char c = (byteOrder == BIG_ENDIAN
+ ? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF))
+ : (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF)));
if (0xD800 <= c && c <= 0xDFFF)
{
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
