git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[multiple changes] 

2004-04-20  Sascha Brawer  <brawer@dandelis.ch>

	* java/awt/image/DataBufferShort.java,
	java/awt/image/DataBufferFloat.java,
	java/awt/image/DataBufferDouble.java,
	java/awt/image/PixelInterleavedSampleModel.java: New files.
	* gnu/java/awt/Buffers.java (createBuffer, createBufferFromData,
	getData): Added support	for TYPE_SHORT, TYPE_FLOAT and TYPE_DOUBLE.

2004-04-20  Michael Koch  <konqueror@gmx.de>

	* Makefile.am (java_source_files): Added
	java/awt/image/DataBufferDouble.java,
	java/awt/image/DataBufferFloat.java,
	java/awt/image/DataBufferShort.java and
	java/awt/image/PixelInterleavedSampleModel.java.
	* Makefile.in: Regenerated.

From-SVN: r80886
This commit is contained in:
Michael Koch 2004-04-20 08:37:47 +00:00
parent 57bef48ec5
commit 8ecb03465a
8 changed files with 644 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libjava/ChangeLog
View File

@ -1,3 +1,21 @@
2004-04-20 Sascha Brawer <brawer@dandelis.ch>
* java/awt/image/DataBufferShort.java,
java/awt/image/DataBufferFloat.java,
java/awt/image/DataBufferDouble.java,
java/awt/image/PixelInterleavedSampleModel.java: New files.
* gnu/java/awt/Buffers.java (createBuffer, createBufferFromData,
getData): Added support for TYPE_SHORT, TYPE_FLOAT and TYPE_DOUBLE.
2004-04-20 Michael Koch <konqueror@gmx.de>
* Makefile.am (java_source_files): Added
java/awt/image/DataBufferDouble.java,
java/awt/image/DataBufferFloat.java,
java/awt/image/DataBufferShort.java and
java/awt/image/PixelInterleavedSampleModel.java.
* Makefile.in: Regenerated.
2004-04-19 Bryce McKinlay <mckinlay@redhat.com>
* gcj/cni.h (JvAllocObject): Remove these obsolete,

4
libjava/Makefile.am
View File

@ -1113,7 +1113,10 @@ java/awt/image/ComponentColorModel.java \
java/awt/image/ComponentSampleModel.java \
java/awt/image/DataBuffer.java \
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 \
java/awt/image/DirectColorModel.java \
java/awt/image/ImageConsumer.java \
@ -1121,6 +1124,7 @@ java/awt/image/ImageObserver.java \
java/awt/image/ImageProducer.java \
java/awt/image/IndexColorModel.java \
java/awt/image/PackedColorModel.java \
java/awt/image/PixelInterleavedSampleModel.java \
java/awt/image/Raster.java \
java/awt/image/RasterOp.java \
java/awt/image/SampleModel.java \

8
libjava/Makefile.in
View File

@ -795,7 +795,10 @@ java/awt/image/ComponentColorModel.java \
java/awt/image/ComponentSampleModel.java \
java/awt/image/DataBuffer.java \
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 \
java/awt/image/DirectColorModel.java \
java/awt/image/ImageConsumer.java \
@ -803,6 +806,7 @@ java/awt/image/ImageObserver.java \
java/awt/image/ImageProducer.java \
java/awt/image/IndexColorModel.java \
java/awt/image/PackedColorModel.java \
java/awt/image/PixelInterleavedSampleModel.java \
java/awt/image/Raster.java \
java/awt/image/RasterOp.java \
java/awt/image/SampleModel.java \
@ -3591,7 +3595,10 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/awt/image/ComponentSampleModel.P \
.deps/java/awt/image/CropImageFilter.P \
.deps/java/awt/image/DataBuffer.P .deps/java/awt/image/DataBufferByte.P \
.deps/java/awt/image/DataBufferDouble.P \
.deps/java/awt/image/DataBufferFloat.P \
.deps/java/awt/image/DataBufferInt.P \
.deps/java/awt/image/DataBufferShort.P \
.deps/java/awt/image/DataBufferUShort.P \
.deps/java/awt/image/DirectColorModel.P \
.deps/java/awt/image/FilteredImageSource.P \
@ -3603,6 +3610,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/awt/image/MemoryImageSource.P \
.deps/java/awt/image/PackedColorModel.P \
.deps/java/awt/image/PixelGrabber.P \
.deps/java/awt/image/PixelInterleavedSampleModel.P \
.deps/java/awt/image/RGBImageFilter.P .deps/java/awt/image/Raster.P \
.deps/java/awt/image/RasterFormatException.P \
.deps/java/awt/image/RasterOp.P .deps/java/awt/image/RenderedImage.P \

41
libjava/gnu/java/awt/Buffers.java
View File

@ -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 @@ public final class Buffers
{
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 @@ public final class Buffers
{
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 @@ public final class Buffers
{
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 @@ public final class Buffers
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();
@ -159,6 +188,16 @@ public final class Buffers
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
{
throw new ClassCastException("Unknown data buffer type");

174
libjava/java/awt/image/DataBufferDouble.java Normal file
View File

@ -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 <a href="mailto:rolfwr@ii.uib.no">Rolf W. Rasmussen</a>
* @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a>
*/
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;
}
}

172
libjava/java/awt/image/DataBufferFloat.java Normal file
View File

@ -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 <a href="mailto:rolfwr@ii.uib.no">Rolf W. Rasmussen</a>
* @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a>
*/
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);
}
}

130
libjava/java/awt/image/DataBufferShort.java Normal file
View File

@ -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 <rolfwr@ii.uib.no>
*/
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;
}
}

98
libjava/java/awt/image/PixelInterleavedSampleModel.java Normal file
View File

@ -0,0 +1,98 @@
/* PixelInterleavedSampleModel.java
Copyright (C) 2004 Free Software Foundation, Inc.
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;
/**
* A <code>SampleModel</code> that uses exactly one element of the
* raster&#x2019;s {@link DataBuffer} per pixel, holds all bands in a
* single bank, and stores band data in pixel-interleaved manner.
*
* @since 1.2
*
* @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a>
*/
public class PixelInterleavedSampleModel
extends ComponentSampleModel
{
public PixelInterleavedSampleModel(int dataType, int width, int height,
int pixelStride, int scanlineStride,
int[] bandOffsets)
{
super(dataType, width, height, pixelStride, scanlineStride,
bandOffsets);
}
/**
* Creates a new <code>SampleModel</code> that is like this one, but
* uses the specified width and height.
*
* @param width the number of pixels in the horizontal direction.
*
* @param height the number of pixels in the vertical direction.
*/
public SampleModel createCompatibleSampleModel(int width, int height)
{
return new PixelInterleavedSampleModel(dataType, width, height,
pixelStride, scanlineStride,
bandOffsets);
}
/**
* Creates a new <code>SampleModel</code> that is like this one, but
* uses only a subset of its bands.
*
* @param bands an array whose elements indicate which bands shall
* be part of the subset. For example, <code>[0, 2, 3]</code> would
* create a SampleModel containing bands #0, #2 and #3.
*/
public SampleModel createSubsetSampleModel(int[] bands)
{
int[] subOffsets;
subOffsets = new int[bands.length];
for (int i = 0; i < bands.length; i++)
subOffsets[i] = bandOffsets[bands[i]];
return new PixelInterleavedSampleModel(dataType, width, height,
pixelStride, scanlineStride,
subOffsets);
}
}