Imported Classpath 0.18.
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* UTF_16Decoder.java --
|
||||
Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
Copyright (C) 2002, 2005 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -105,8 +105,9 @@ final class UTF_16Decoder extends CharsetDecoder
|
||||
}
|
||||
|
||||
// FIXME: Change so you only do a single comparison here.
|
||||
char c = byteOrder == BIG_ENDIAN ? (char) ((b1 << 8) | b2)
|
||||
: (char) ((b2 << 8) | b1);
|
||||
char c = (byteOrder == BIG_ENDIAN
|
||||
? (char) (((b1 & 0xFF) << 8) | (b2 & 0xFF))
|
||||
: (char) (((b2 & 0xFF) << 8) | (b1 & 0xFF)));
|
||||
|
||||
if (0xD800 <= c && c <= 0xDFFF)
|
||||
{
|
||||
@@ -119,8 +120,9 @@ final class UTF_16Decoder extends CharsetDecoder
|
||||
return CoderResult.UNDERFLOW;
|
||||
byte b3 = in.get ();
|
||||
byte b4 = in.get ();
|
||||
char d = byteOrder == BIG_ENDIAN ? (char) ((b3 << 8) | b4)
|
||||
: (char) ((b4 << 8) | b3);
|
||||
char d = (byteOrder == BIG_ENDIAN
|
||||
? (char) (((b3 & 0xFF) << 8) | (b4 & 0xFF))
|
||||
: (char) (((b4 & 0xFF) << 8) | (b3 & 0xFF)));
|
||||
// make sure d is a low surrogate
|
||||
if (d < 0xDC00 || d > 0xDFFF)
|
||||
return CoderResult.malformedForLength (2);
|
||||
|
||||
@@ -38,7 +38,7 @@ exception statement from your version. */
|
||||
|
||||
package gnu.java.nio.charset.iconv;
|
||||
|
||||
import gnu.classpath.RawData;
|
||||
import gnu.classpath.Pointer;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.CharBuffer;
|
||||
@@ -55,7 +55,7 @@ final class IconvDecoder extends CharsetDecoder
|
||||
openIconv(info.iconvName());
|
||||
}
|
||||
|
||||
private RawData data;
|
||||
private Pointer data;
|
||||
private int inremaining;
|
||||
private int outremaining;
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ exception statement from your version. */
|
||||
|
||||
package gnu.java.nio.charset.iconv;
|
||||
|
||||
import gnu.classpath.RawData;
|
||||
import gnu.classpath.Pointer;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.CharBuffer;
|
||||
@@ -49,7 +49,7 @@ import java.nio.charset.CoderResult;
|
||||
|
||||
final class IconvEncoder extends CharsetEncoder
|
||||
{
|
||||
private RawData data;
|
||||
private Pointer data;
|
||||
private int inremaining;
|
||||
private int outremaining;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user