PatchSet 5291
Date: 2004/10/14 23:35:35
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: initialization fixes for java.awt.image
2004-10-14 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/java/awt/image/DataBufferByte.java,
libraries/javalib/java/awt/image/DataBufferDouble.java,
libraries/javalib/java/awt/image/DataBufferFloat.java,
libraries/javalib/java/awt/image/DataBufferInt.java,
libraries/javalib/java/awt/image/DataBufferShort.java,
libraries/javalib/java/awt/image/DataBufferUShort.java:
Resynced with GNU Classpath.
2004-10-13 Michael Koch <[EMAIL PROTECTED]>
* java/awt/image/DataBufferByte.java,
java/awt/image/DataBufferDouble.java,
java/awt/image/DataBufferFloat.java,
java/awt/image/DataBufferInt.java,
java/awt/image/DataBufferShort.java,
java/awt/image/DataBufferUShort.java:
Fix initialization of bankData in constructors.
Members:
ChangeLog:1.2843->1.2844
libraries/javalib/java/awt/image/DataBufferByte.java:1.3->1.4
libraries/javalib/java/awt/image/DataBufferDouble.java:1.2->1.3
libraries/javalib/java/awt/image/DataBufferFloat.java:1.2->1.3
libraries/javalib/java/awt/image/DataBufferInt.java:1.3->1.4
libraries/javalib/java/awt/image/DataBufferShort.java:1.2->1.3
libraries/javalib/java/awt/image/DataBufferUShort.java:1.3->1.4
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2843 kaffe/ChangeLog:1.2844
--- kaffe/ChangeLog:1.2843 Thu Oct 14 22:51:54 2004
+++ kaffe/ChangeLog Thu Oct 14 23:35:35 2004
@@ -1,5 +1,25 @@
2004-10-14 Dalibor Topic <[EMAIL PROTECTED]>
+ * libraries/javalib/java/awt/image/DataBufferByte.java,
+ libraries/javalib/java/awt/image/DataBufferDouble.java,
+ libraries/javalib/java/awt/image/DataBufferFloat.java,
+ libraries/javalib/java/awt/image/DataBufferInt.java,
+ libraries/javalib/java/awt/image/DataBufferShort.java,
+ libraries/javalib/java/awt/image/DataBufferUShort.java:
+ Resynced with GNU Classpath.
+
+ 2004-10-13 Michael Koch <[EMAIL PROTECTED]>
+
+ * java/awt/image/DataBufferByte.java,
+ java/awt/image/DataBufferDouble.java,
+ java/awt/image/DataBufferFloat.java,
+ java/awt/image/DataBufferInt.java,
+ java/awt/image/DataBufferShort.java,
+ java/awt/image/DataBufferUShort.java:
+ Fix initialization of bankData in constructors.
+
+2004-10-14 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/javalib/java/net/BindException.java,
libraries/javalib/java/net/ConnectException.java,
libraries/javalib/java/net/ContentHandler.java,
Index: kaffe/libraries/javalib/java/awt/image/DataBufferByte.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferByte.java:1.3
kaffe/libraries/javalib/java/awt/image/DataBufferByte.java:1.4
--- kaffe/libraries/javalib/java/awt/image/DataBufferByte.java:1.3 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferByte.java Thu Oct 14 23:35:37
2004
@@ -62,8 +62,10 @@
*/
public DataBufferByte(int size)
{
- super(TYPE_BYTE, size);
+ super(TYPE_BYTE, size, 1, 0);
+ bankData = new byte[1][];
data = new byte[size];
+ bankData[0] = data;
}
/**
@@ -92,8 +94,10 @@
*/
public DataBufferByte(byte[] dataArray, int size)
{
- super(TYPE_BYTE, size);
+ super(TYPE_BYTE, size, 1, 0);
+ bankData = new byte[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -111,7 +115,9 @@
public DataBufferByte(byte[] dataArray, int size, int offset)
{
super(TYPE_BYTE, size, 1, offset);
+ bankData = new byte[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
Index: kaffe/libraries/javalib/java/awt/image/DataBufferDouble.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferDouble.java:1.2
kaffe/libraries/javalib/java/awt/image/DataBufferDouble.java:1.3
--- kaffe/libraries/javalib/java/awt/image/DataBufferDouble.java:1.2 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferDouble.java Thu Oct 14
23:35:37 2004
@@ -66,8 +66,10 @@
*/
public DataBufferDouble(int size)
{
- super(TYPE_DOUBLE, size);
+ super(TYPE_DOUBLE, size, 1, 0);
+ bankData = new double[1][];
data = new double[size];
+ bankData[0] = data;
}
/**
@@ -96,8 +98,10 @@
*/
public DataBufferDouble(double[] dataArray, int size)
{
- super(TYPE_DOUBLE, size);
+ super(TYPE_DOUBLE, size, 1, 0);
+ bankData = new double[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -115,7 +119,9 @@
public DataBufferDouble(double[] dataArray, int size, int offset)
{
super(TYPE_DOUBLE, size, 1, offset);
+ bankData = new double[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
Index: kaffe/libraries/javalib/java/awt/image/DataBufferFloat.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferFloat.java:1.2
kaffe/libraries/javalib/java/awt/image/DataBufferFloat.java:1.3
--- kaffe/libraries/javalib/java/awt/image/DataBufferFloat.java:1.2 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferFloat.java Thu Oct 14 23:35:37
2004
@@ -64,8 +64,10 @@
*/
public DataBufferFloat(int size)
{
- super(TYPE_FLOAT, size);
+ super(TYPE_FLOAT, size, 1, 0);
+ bankData = new float[1][];
data = new float[size];
+ bankData[0] = data;
}
/**
@@ -94,8 +96,10 @@
*/
public DataBufferFloat(float[] dataArray, int size)
{
- super(TYPE_FLOAT, size);
+ super(TYPE_FLOAT, size, 1, 0);
+ bankData = new float[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -113,7 +117,9 @@
public DataBufferFloat(float[] dataArray, int size, int offset)
{
super(TYPE_FLOAT, size, 1, offset);
+ bankData = new float[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
Index: kaffe/libraries/javalib/java/awt/image/DataBufferInt.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferInt.java:1.3
kaffe/libraries/javalib/java/awt/image/DataBufferInt.java:1.4
--- kaffe/libraries/javalib/java/awt/image/DataBufferInt.java:1.3 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferInt.java Thu Oct 14 23:35:37
2004
@@ -62,8 +62,10 @@
*/
public DataBufferInt(int size)
{
- super(TYPE_INT, size);
+ super(TYPE_INT, size, 1, 0);
+ bankData = new int[1][];
data = new int[size];
+ bankData[0] = data;
}
/**
@@ -92,8 +94,10 @@
*/
public DataBufferInt(int[] dataArray, int size)
{
- super(TYPE_INT, size);
+ super(TYPE_INT, size, 1, 0);
+ bankData = new int[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -111,7 +115,9 @@
public DataBufferInt(int[] dataArray, int size, int offset)
{
super(TYPE_INT, size, 1, offset);
+ bankData = new int[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
Index: kaffe/libraries/javalib/java/awt/image/DataBufferShort.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.2
kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.3
--- kaffe/libraries/javalib/java/awt/image/DataBufferShort.java:1.2 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferShort.java Thu Oct 14 23:35:37
2004
@@ -62,8 +62,10 @@
*/
public DataBufferShort(int size)
{
- super(TYPE_SHORT, size);
+ super(TYPE_SHORT, size, 1, 0);
+ bankData = new short[1][];
data = new short[size];
+ bankData[0] = data;
}
/**
@@ -92,8 +94,10 @@
*/
public DataBufferShort(short[] dataArray, int size)
{
- super(TYPE_SHORT, size);
+ super(TYPE_SHORT, size, 1, 0);
+ bankData = new short[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -111,7 +115,9 @@
public DataBufferShort(short[] dataArray, int size, int offset)
{
super(TYPE_SHORT, size, 1, offset);
+ bankData = new short[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
Index: kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java
diff -u kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.3
kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.4
--- kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java:1.3 Sun Sep 12
15:11:02 2004
+++ kaffe/libraries/javalib/java/awt/image/DataBufferUShort.java Thu Oct 14
23:35:37 2004
@@ -62,8 +62,10 @@
*/
public DataBufferUShort(int size)
{
- super(TYPE_USHORT, size);
+ super(TYPE_USHORT, size, 1, 0);
+ bankData = new short[1][];
data = new short[size];
+ bankData[0] = data;
}
/**
@@ -88,8 +90,10 @@
*/
public DataBufferUShort(short[] dataArray, int size)
{
- super(TYPE_USHORT, size);
+ super(TYPE_USHORT, size, 1, 0);
+ bankData = new short[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
@@ -103,7 +107,9 @@
public DataBufferUShort(short[] dataArray, int size, int offset)
{
super(TYPE_USHORT, size, 1, offset);
+ bankData = new short[1][];
data = dataArray;
+ bankData[0] = data;
}
/**
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
