Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2031 diff -u -r1.2031 ChangeLog --- ChangeLog 14 Apr 2004 11:01:13 -0000 1.2031 +++ ChangeLog 15 Apr 2004 07:41:05 -0000 @@ -1,5 +1,18 @@ 2004-04-14 Sascha Brawer + * java/awt/image/DataBufferShort.java, + java/awt/image/DataBufferFloat.java, + java/awt/image/DataBufferDouble.java: New files. + + * java/awt/image/Makefile.am (EXTRA_DIST): Added + DataBufferShort.java, DataBufferFloat.java, and + DataBufferDouble.java. + + * gnu/java/awt/Buffers.java (createBuffer, createBufferFromData, + getData): Added support for TYPE_SHORT, TYPE_FLOAT and TYPE_DOUBLE. + +2004-04-14 Sascha Brawer + * java/awt/image/Makefile.am (EXTRA_DIST): Added PixelInterleavedSampleModel.java Index: java/awt/image/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/Makefile.am,v retrieving revision 1.8 diff -u -r1.8 Makefile.am --- java/awt/image/Makefile.am 14 Apr 2004 11:01:13 -0000 1.8 +++ java/awt/image/Makefile.am 15 Apr 2004 07:41:05 -0000 @@ -12,7 +12,10 @@ CropImageFilter.java \ DataBuffer.java \ DataBufferByte.java \ +DataBufferDouble.java \ +DataBufferFloat.java \ DataBufferInt.java \ +DataBufferShort.java \ DataBufferUShort.java \ DirectColorModel.java \ FilteredImageSource.java \ Index: java/awt/image/DataBufferDouble.java =================================================================== RCS file: java/awt/image/DataBufferDouble.java diff -N java/awt/image/DataBufferDouble.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ java/awt/image/DataBufferDouble.java 15 Apr 2004 07:41:05 -0000 @@ -0,0 +1,174 @@ +/* Copyright (C) 2004 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.awt.image; + +/* This is one of several classes that are nearly identical. Maybe we + should have a central template and generate all these files. This + is one of the cases where templates or macros would have been + useful to have in Java. + + This file has been created using search-replace. My only fear is + that these classes will grow out-of-sync as of a result of changes + that are not propagated to the other files. As always, mirroring + code is a maintenance nightmare. */ + +/** + * @since 1.4 + * + * @author Rolf W. Rasmussen + * @author Sascha Brawer + */ +public final class DataBufferDouble + extends DataBuffer +{ + private double[] data; + private double[][] bankData; + + public DataBufferDouble(int size) + { + super(TYPE_DOUBLE, size); + data = new double[size]; + } + + public DataBufferDouble(int size, int numBanks) + { + super(TYPE_DOUBLE, size, numBanks); + bankData = new double[numBanks][size]; + data = bankData[0]; + } + + public DataBufferDouble(double[] dataArray, int size) + { + super(TYPE_DOUBLE, size); + data = dataArray; + } + + public DataBufferDouble(double[] dataArray, int size, int offset) + { + super(TYPE_DOUBLE, size, 1, offset); + data = dataArray; + } + + public DataBufferDouble(double[][] dataArray, int size) + { + super(TYPE_DOUBLE, size, dataArray.length); + bankData = dataArray; + data = bankData[0]; + } + + public DataBufferDouble(double[][] dataArray, int size, int[] offsets) + { + super(TYPE_DOUBLE, size, dataArray.length, offsets); + bankData = dataArray; + data = bankData[0]; + } + + public double[] getData() + { + return data; + } + + public double[] getData(int bank) + { + return bankData[bank]; + } + + public double[][] getBankData() + { + return bankData; + } + + public int getElem(int i) + { + return (int) data[i+offset]; + } + + public int getElem(int bank, int i) + { + return (int) bankData[bank][i+offsets[bank]]; + } + + public void setElem(int i, int val) + { + data[i+offset] = (double) val; + } + + public void setElem(int bank, int i, int val) + { + bankData[bank][i+offsets[bank]] = (double) val; + } + + public float getElemFloat(int i) + { + return (float) data[i+offset]; + } + + public float getElemFloat(int bank, int i) + { + return (float) bankData[bank][i+offsets[bank]]; + } + + public void setElemFloat(int i, float val) + { + data[i+offset] = val; + } + + public void setElemFloat(int bank, int i, float val) + { + bankData[bank][i+offsets[bank]] = val; + } + + public double getElemDouble(int i) + { + return data[i + offset]; + } + + public double getElemDouble(int bank, int i) + { + return bankData[bank][i + offsets[bank]]; + } + + public void setElemDouble(int i, double val) + { + data[i + offset] = val; + } + + public void setElemDouble(int bank, int i, double val) + { + bankData[bank][i + offsets[bank]] = val; + } +} Index: java/awt/image/DataBufferFloat.java =================================================================== RCS file: java/awt/image/DataBufferFloat.java diff -N java/awt/image/DataBufferFloat.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ java/awt/image/DataBufferFloat.java 15 Apr 2004 07:41:05 -0000 @@ -0,0 +1,172 @@ +/* Copyright (C) 2004 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.awt.image; + +/* This is one of several classes that are nearly identical. Maybe we + should have a central template and generate all these files. This + is one of the cases where templates or macros would have been + useful to have in Java. + + This file has been created using search-replace. My only fear is + that these classes will grow out-of-sync as of a result of changes + that are not propagated to the other files. As always, mirroring + code is a maintenance nightmare. */ + +/** + * @author Rolf W. Rasmussen + * @author Sascha Brawer + */ +public final class DataBufferFloat + extends DataBuffer +{ + private float[] data; + private float[][] bankData; + + public DataBufferFloat(int size) + { + super(TYPE_FLOAT, size); + data = new float[size]; + } + + public DataBufferFloat(int size, int numBanks) + { + super(TYPE_FLOAT, size, numBanks); + bankData = new float[numBanks][size]; + data = bankData[0]; + } + + public DataBufferFloat(float[] dataArray, int size) + { + super(TYPE_FLOAT, size); + data = dataArray; + } + + public DataBufferFloat(float[] dataArray, int size, int offset) + { + super(TYPE_FLOAT, size, 1, offset); + data = dataArray; + } + + public DataBufferFloat(float[][] dataArray, int size) + { + super(TYPE_FLOAT, size, dataArray.length); + bankData = dataArray; + data = bankData[0]; + } + + public DataBufferFloat(float[][] dataArray, int size, int[] offsets) + { + super(TYPE_FLOAT, size, dataArray.length, offsets); + bankData = dataArray; + data = bankData[0]; + } + + public float[] getData() + { + return data; + } + + public float[] getData(int bank) + { + return bankData[bank]; + } + + public float[][] getBankData() + { + return bankData; + } + + public int getElem(int i) + { + return (int) data[i+offset]; + } + + public int getElem(int bank, int i) + { + return (int) bankData[bank][i+offsets[bank]]; + } + + public void setElem(int i, int val) + { + data[i+offset] = (float) val; + } + + public void setElem(int bank, int i, int val) + { + bankData[bank][i+offsets[bank]] = (float) val; + } + + public float getElemFloat(int i) + { + return data[i+offset]; + } + + public float getElemFloat(int bank, int i) + { + return bankData[bank][i+offsets[bank]]; + } + + public void setElemFloat(int i, float val) + { + data[i+offset] = val; + } + + public void setElemFloat(int bank, int i, float val) + { + bankData[bank][i+offsets[bank]] = val; + } + + public double getElemDouble(int i) + { + return getElemFloat(i); + } + + public double getElemDouble(int bank, int i) + { + return getElemFloat(bank, i); + } + + public void setElemDouble(int i, double val) + { + setElemFloat(i, (float) val); + } + + public void setElemDouble(int bank, int i, double val) + { + setElemFloat(bank, i, (float) val); + } +} Index: java/awt/image/DataBufferShort.java =================================================================== RCS file: java/awt/image/DataBufferShort.java diff -N java/awt/image/DataBufferShort.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ java/awt/image/DataBufferShort.java 15 Apr 2004 07:41:05 -0000 @@ -0,0 +1,130 @@ +/* Copyright (C) 2004 Free Software Foundation + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.awt.image; + +/* This is one of several classes that are nearly identical. Maybe we + should have a central template and generate all these files. This + is one of the cases where templates or macros would have been + useful to have in Java. + + This file has been created using search-replace. My only fear is + that these classes will grow out-of-sync as of a result of changes + that are not propagated to the other files. As always, mirroring + code is a maintenance nightmare. */ + +/** + * @author Rolf W. Rasmussen + */ +public final class DataBufferShort extends DataBuffer +{ + private short[] data; + private short[][] bankData; + + public DataBufferShort(int size) + { + super(TYPE_SHORT, size); + data = new short[size]; + } + + public DataBufferShort(int size, int numBanks) + { + super(TYPE_SHORT, size, numBanks); + bankData = new short[numBanks][size]; + data = bankData[0]; + } + + public DataBufferShort(short[] dataArray, int size) + { + super(TYPE_SHORT, size); + data = dataArray; + } + + public DataBufferShort(short[] dataArray, int size, int offset) + { + super(TYPE_SHORT, size, 1, offset); + data = dataArray; + } + + public DataBufferShort(short[][] dataArray, int size) + { + super(TYPE_SHORT, size, dataArray.length); + bankData = dataArray; + data = bankData[0]; + } + + public DataBufferShort(short[][] dataArray, int size, int[] offsets) + { + super(TYPE_SHORT, size, dataArray.length, offsets); + bankData = dataArray; + data = bankData[0]; + } + + public short[] getData() + { + return data; + } + + public short[] getData(int bank) + { + return bankData[bank]; + } + + public short[][] getBankData() + { + return bankData; + } + + public int getElem(int i) + { + return data[i+offset]; + } + + public int getElem(int bank, int i) + { + return bankData[bank][i+offsets[bank]]; + } + + public void setElem(int i, int val) + { + data[i+offset] = (short) val; + } + + public void setElem(int bank, int i, int val) + { + bankData[bank][i+offsets[bank]] = (short) val; + } +} Index: gnu/java/awt/Buffers.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/Buffers.java,v retrieving revision 1.2 diff -u -r1.2 Buffers.java --- gnu/java/awt/Buffers.java 22 Jan 2002 22:26:56 -0000 1.2 +++ gnu/java/awt/Buffers.java 15 Apr 2004 07:41:05 -0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -83,10 +83,16 @@ { case DataBuffer.TYPE_BYTE: return new DataBufferByte(size, numBanks); + case DataBuffer.TYPE_SHORT: + return new DataBufferShort(size, numBanks); case DataBuffer.TYPE_USHORT: return new DataBufferUShort(size, numBanks); case DataBuffer.TYPE_INT: return new DataBufferInt(size, numBanks); + case DataBuffer.TYPE_FLOAT: + return new DataBufferFloat(size, numBanks); + case DataBuffer.TYPE_DOUBLE: + return new DataBufferDouble(size, numBanks); default: throw new UnsupportedOperationException(); } @@ -106,10 +112,16 @@ { case DataBuffer.TYPE_BYTE: return new DataBufferByte((byte[]) data, size); + case DataBuffer.TYPE_SHORT: + return new DataBufferShort((short[]) data, size); case DataBuffer.TYPE_USHORT: return new DataBufferUShort((short[]) data, size); case DataBuffer.TYPE_INT: return new DataBufferInt((int[]) data, size); + case DataBuffer.TYPE_FLOAT: + return new DataBufferFloat((float[]) data, size); + case DataBuffer.TYPE_DOUBLE: + return new DataBufferDouble((double[]) data, size); default: throw new UnsupportedOperationException(); } @@ -126,10 +138,22 @@ { if (buffer instanceof DataBufferByte) return ((DataBufferByte) buffer).getData(); + + if (buffer instanceof DataBufferShort) + return ((DataBufferShort) buffer).getData(); + if (buffer instanceof DataBufferUShort) return ((DataBufferUShort) buffer).getData(); + if (buffer instanceof DataBufferInt) return ((DataBufferInt) buffer).getData(); + + if (buffer instanceof DataBufferFloat) + return ((DataBufferFloat) buffer).getData(); + + if (buffer instanceof DataBufferDouble) + return ((DataBufferDouble) buffer).getData(); + throw new ClassCastException("Unknown data buffer type"); } @@ -149,6 +173,11 @@ from = ((DataBufferByte) src).getData(); if (dest == null) dest = new byte[length+destOffset]; } + else if (src instanceof DataBufferShort) + { + from = ((DataBufferShort) src).getData(); + if (dest == null) dest = new short[length+destOffset]; + } else if (src instanceof DataBufferUShort) { from = ((DataBufferUShort) src).getData(); @@ -158,6 +187,16 @@ { from = ((DataBufferInt) src).getData(); if (dest == null) dest = new int[length+destOffset]; + } + else if (src instanceof DataBufferFloat) + { + from = ((DataBufferFloat) src).getData(); + if (dest == null) dest = new float[length+destOffset]; + } + else if (src instanceof DataBufferDouble) + { + from = ((DataBufferDouble) src).getData(); + if (dest == null) dest = new double[length+destOffset]; } else {