This removes any usage of the Buffers helper class in
ComponentSampleModel. The problem with that has been that it casts the
DataBuffer to some specific subtype, which wouldn't work for other
independent implementations of DataBuffer (e.g. a DataBuffer that maps
to raw shared memory). Also, the SampleModels tend to support different
types and thus it isn't feasible to share this behaviour. This also
removes some 'optimization' that really doesn't do much, and doesn't
seem to be present in the JDK either (in setDataElements() and
getDataElements). This only makes the code overly complicated and I'm
not sure if it's correct in all possible cases either (especially with
subclasses altering some behaviour).
2007-03-09 Roman Kennke <[EMAIL PROTECTED]>
* java/awt/image/ComponentSampleModel.java
(tightPixelPacking): Removed.
(ComponentSampleModel): Removed unnecessary 'optimization' code.
(createDataBuffer): Avoid use of Buffers helper class.
(getDataElements(int,int,int,int,Object,DataBuffer): Removed.
(getDataElements(int,int,Object,DataBuffer): Do not use Buffers
helper class and instead fetch the values directly. Don't expect
any specific DataBuffer subclass.
(setDataElements(int,int,int,int,Object,DataBuffer): Removed.
(setDataElements(int,int,Object,DataBuffer): Do not use Buffers
helper class and instead set the values directly. Don't expect
any specific DataBuffer subclass.
/Roman
--
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com * Tel: +49-721-663 968-0
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt
Index: java/awt/image/ComponentSampleModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ComponentSampleModel.java,v
retrieving revision 1.16
diff -u -1 -5 -r1.16 ComponentSampleModel.java
--- java/awt/image/ComponentSampleModel.java 20 Jul 2006 08:45:20 -0000 1.16
+++ java/awt/image/ComponentSampleModel.java 9 Mar 2007 09:41:01 -0000
@@ -24,36 +24,32 @@
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;
-import gnu.java.awt.Buffers;
-
import java.util.Arrays;
-/* FIXME: This class does not yet support data type TYPE_SHORT */
-
/**
* ComponentSampleModel supports a flexible organization of pixel samples in
* memory, permitting pixel samples to be interleaved by band, by scanline,
* and by pixel.
*
* A DataBuffer for this sample model has K banks of data. Pixels have N
* samples, so there are N bands in the DataBuffer. Each band is completely
* contained in one bank of data, but a bank may contain more than one band.
* Each pixel sample is stored in a single data element.
*
* Within a bank, each band begins at an offset stored in bandOffsets. The
* banks containing the band is given by bankIndices. Within the bank, there
* are three dimensions - band, pixel, and scanline. The dimension ordering
* is controlled by bandOffset, pixelStride, and scanlineStride, which means
* that any combination of interleavings is supported.
@@ -76,33 +72,31 @@
/** Used when creating data buffers. */
protected int numBanks;
/**
* The number of data elements between a sample in one row and the
* corresponding sample in the next row.
*/
protected int scanlineStride;
/**
* The number of data elements between a sample for one pixel and the
* corresponding sample for the next pixel in the same row.
*/
protected int pixelStride;
-
- private boolean tightPixelPacking = false;
-
+
/**
* Creates a new sample model that assumes that all bands are stored in a
* single bank of the [EMAIL PROTECTED] DataBuffer}.
* <p>
* Note that the <code>bandOffsets</code> array is copied to internal storage
* to prevent subsequent changes to the array from affecting this object.
*
* @param dataType the data type (one of [EMAIL PROTECTED] DataBuffer#TYPE_BYTE},
* [EMAIL PROTECTED] DataBuffer#TYPE_USHORT}, [EMAIL PROTECTED] DataBuffer#TYPE_SHORT},
* [EMAIL PROTECTED] DataBuffer#TYPE_INT}, [EMAIL PROTECTED] DataBuffer#TYPE_FLOAT} or
* [EMAIL PROTECTED] DataBuffer#TYPE_DOUBLE}).
* @param w the width in pixels.
* @param h the height in pixels.
* @param pixelStride the number of data elements in the step from a sample
* in one pixel to the corresponding sample in the next pixel.
@@ -191,46 +185,30 @@
if ((pixelStride < 0) || (scanlineStride < 0) || (bandOffsets.length < 1)
|| (bandOffsets.length != bankIndices.length))
throw new IllegalArgumentException();
this.bandOffsets = (int[]) bandOffsets.clone();
this.bankIndices = (int[]) bankIndices.clone();
this.numBands = bandOffsets.length;
this.numBanks = 0;
for (int b = 0; b < bankIndices.length; b++)
this.numBanks = Math.max(this.numBanks, bankIndices[b] + 1);
this.scanlineStride = scanlineStride;
this.pixelStride = pixelStride;
- // See if we can use some speedups
-
- /* FIXME: May these checks should be reserved for the
- PixelInterleavedSampleModel? */
-
- if (pixelStride == numBands)
- {
- tightPixelPacking = true;
- for (int b = 0; b < numBands; b++) {
- if ((bandOffsets[b] != b) || (bankIndices[b] != 0))
- {
- tightPixelPacking = false;
- break;
- }
- }
- }
}
/**
* Creates a new sample model that is compatible with this one, but with the
* specified dimensions.
*
* @param w the width (must be greater than zero).
* @param h the height (must be greater than zero).
*
* @return A new sample model.
*/
public SampleModel createCompatibleSampleModel(int w, int h)
{
return new ComponentSampleModel(dataType, w, h, pixelStride,
scanlineStride, bankIndices,
@@ -263,32 +241,54 @@
}
/**
* Creates a new data buffer that is compatible with this sample model.
*
* @return The new data buffer.
*/
public DataBuffer createDataBuffer()
{
// Maybe this value should be precalculated in the constructor?
int highestOffset = 0;
for (int b = 0; b < numBands; b++)
highestOffset = Math.max(highestOffset, bandOffsets[b]);
int size = pixelStride * (width - 1) + scanlineStride * (height - 1)
+ highestOffset + 1;
-
- return Buffers.createBuffer(getDataType(), size, numBanks);
+
+ DataBuffer buffer = null;
+ switch (getTransferType())
+ {
+ case DataBuffer.TYPE_BYTE:
+ buffer = new DataBufferByte(size, numBanks);
+ break;
+ case DataBuffer.TYPE_SHORT:
+ buffer = new DataBufferShort(size, numBanks);
+ break;
+ case DataBuffer.TYPE_USHORT:
+ buffer = new DataBufferUShort(size, numBanks);
+ break;
+ case DataBuffer.TYPE_INT:
+ buffer = new DataBufferInt(size, numBanks);
+ break;
+ case DataBuffer.TYPE_FLOAT:
+ buffer = new DataBufferFloat(size, numBanks);
+ break;
+ case DataBuffer.TYPE_DOUBLE:
+ buffer = new DataBufferDouble(size, numBanks);
+ break;
+ }
+ return buffer;
}
/**
* Returns the offset of the sample in band 0 for the pixel at location
* <code>(x, y)</code>. This offset can be used to read a sample value from
* a [EMAIL PROTECTED] DataBuffer}.
*
* @param x the x-coordinate.
* @param y the y-coordinate.
*
* @return The offset.
*
* @see #getOffset(int, int, int)
*/
public int getOffset(int x, int y)
@@ -412,263 +412,104 @@
* a primitive array (the array type is determined by the data type for
* this model). The <code>obj</code> argument provides an option to supply
* an existing array to hold the result, if this is <code>null</code> a new
* array will be allocated.
*
* @param x the x-coordinate.
* @param y the y-coordinate.
* @param obj a primitive array that, if not <code>null</code>, will be
* used to store and return the sample values.
* @param data the data buffer (<code>null</code> not permitted).
*
* @return An array of sample values for the specified pixel.
*/
public Object getDataElements(int x, int y, Object obj, DataBuffer data)
{
- int xyOffset = pixelStride * x + scanlineStride * y;
-
- int[] totalBandDataOffsets = new int[numBands];
-
- /* Notice that band and bank offsets are different. Band offsets
- are managed by the sample model, and bank offsets are managed
- by the data buffer. Both must be accounted for. */
-
- /* FIXME: For single pixels, it is probably easier to simple
- call getElem instead of calculating the bank offset ourself.
-
- On the other hand, then we need to push the value through
- the int type returned by the getElem method. */
-
- int[] bankOffsets = data.getOffsets();
-
- for (int b = 0; b < numBands; b++)
+ int type = getTransferType();
+ int numDataEls = getNumDataElements();
+ int offset = y * scanlineStride + x * pixelStride;
+ switch (type)
{
- totalBandDataOffsets[b] = bandOffsets[b] + bankOffsets[bankIndices[b]]
- + xyOffset;
- }
-
- try
- {
- switch (getTransferType())
+ case DataBuffer.TYPE_BYTE:
+ byte[] bData;
+ if (obj == null)
+ bData = new byte[numDataEls];
+ else
+ bData = (byte[]) obj;
+ for (int i = 0; i < numDataEls; i++)
{
- case DataBuffer.TYPE_BYTE:
- DataBufferByte inByte = (DataBufferByte) data;
- byte[] outByte = (byte[]) obj;
- if (outByte == null)
- outByte = new byte[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outByte[b] = inByte.getData(bankIndices[b])[dOffset];
- }
- return outByte;
-
- case DataBuffer.TYPE_USHORT:
- DataBufferUShort inUShort = (DataBufferUShort) data;
- short[] outUShort = (short[]) obj;
- if (outUShort == null)
- outUShort = new short[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outUShort[b] = inUShort.getData(bankIndices[b])[dOffset];
- }
- return outUShort;
-
- case DataBuffer.TYPE_SHORT:
- DataBufferShort inShort = (DataBufferShort) data;
- short[] outShort = (short[]) obj;
- if (outShort == null)
- outShort = new short[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outShort[b] = inShort.getData(bankIndices[b])[dOffset];
- }
- return outShort;
-
- case DataBuffer.TYPE_INT:
- DataBufferInt inInt = (DataBufferInt) data;
- int[] outInt = (int[]) obj;
- if (outInt == null)
- outInt = new int[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outInt[b] = inInt.getData(bankIndices[b])[dOffset];
- }
- return outInt;
-
- case DataBuffer.TYPE_FLOAT:
- DataBufferFloat inFloat = (DataBufferFloat) data;
- float[] outFloat = (float[]) obj;
- if (outFloat == null)
- outFloat = new float[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outFloat[b] = inFloat.getData(bankIndices[b])[dOffset];
- }
- return outFloat;
-
- case DataBuffer.TYPE_DOUBLE:
- DataBufferDouble inDouble = (DataBufferDouble) data;
- double[] outDouble = (double[]) obj;
- if (outDouble == null)
- outDouble = new double[numBands];
-
- for (int b = 0; b < numBands; b++)
- {
- int dOffset = totalBandDataOffsets[b];
- outDouble[b] = inDouble.getData(bankIndices[b])[dOffset];
- }
- return outDouble;
-
- default:
- throw new IllegalStateException("unknown transfer type "
- + getTransferType());
+ bData[i] = (byte) data.getElem(bankIndices[i],
+ offset + bandOffsets[i]);
}
- }
- catch (ArrayIndexOutOfBoundsException aioobe)
- {
- String msg = "While reading data elements, " +
- "x=" + x + ", y=" + y +", " + ", xyOffset=" + xyOffset +
- ", data.getSize()=" + data.getSize() + ": " + aioobe;
- throw new ArrayIndexOutOfBoundsException(msg);
- }
- }
-
- /**
- * Returns the samples for the pixels in the region defined by
- * <code>(x, y, w, h)</code> in a primitive array (the array type is
- * determined by the data type for this model). The <code>obj</code>
- * argument provides an option to supply an existing array to hold the
- * result, if this is <code>null</code> a new array will be allocated.
- *
- * @param x the x-coordinate.
- * @param y the y-coordinate.
- * @param w the width.
- * @param h the height.
- * @param obj a primitive array that, if not <code>null</code>, will be
- * used to store and return the sample values.
- * @param data the data buffer (<code>null</code> not permitted).
- *
- * @return An array of sample values for the specified pixels.
- *
- * @see #setDataElements(int, int, int, int, Object, DataBuffer)
- */
- public Object getDataElements(int x, int y, int w, int h, Object obj,
- DataBuffer data)
- {
- if (!tightPixelPacking)
- {
- return super.getDataElements(x, y, w, h, obj, data);
- }
-
- // using get speedup
-
- // We can copy whole rows
- int rowSize = w * numBands;
- int dataSize = rowSize * h;
-
- DataBuffer transferBuffer = Buffers.createBuffer(getTransferType(), obj,
- dataSize);
- obj = Buffers.getData(transferBuffer);
-
- int inOffset = pixelStride * x + scanlineStride * y + data.getOffset();
- // Assumes only one band is used
-
- /* We don't add band offsets since we assume that bands have
- offsets 0, 1, 2, ... */
-
- // See if we can copy everything in one go
- if (scanlineStride == rowSize)
- {
- // Collapse scan lines:
- rowSize *= h;
- // We ignore scanlineStride since it won't be of any use
- h = 1;
- }
-
- int outOffset = 0;
- Object inArray = Buffers.getData(data);
- for (int yd = 0; yd < h; yd++)
- {
- System.arraycopy(inArray, inOffset, obj, outOffset, rowSize);
- inOffset += scanlineStride;
- outOffset += rowSize;
+ obj = bData;
+ break;
+ case DataBuffer.TYPE_SHORT:
+ case DataBuffer.TYPE_USHORT:
+ short[] sData;
+ if (obj == null)
+ sData = new short[numDataEls];
+ else
+ sData = (short[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ sData[i] = (short) data.getElem(bankIndices[i],
+ offset + bandOffsets[i]);
+ }
+ obj = sData;
+ break;
+ case DataBuffer.TYPE_INT:
+ int[] iData;
+ if (obj == null)
+ iData = new int[numDataEls];
+ else
+ iData = (int[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ iData[i] = data.getElem(bankIndices[i], offset + bandOffsets[i]);
+ }
+ obj = iData;
+ break;
+ case DataBuffer.TYPE_FLOAT:
+ float[] fData;
+ if (obj == null)
+ fData = new float[numDataEls];
+ else
+ fData = (float[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ fData[i] = data.getElemFloat(bankIndices[i],
+ offset + bandOffsets[i]);
+ }
+ obj = fData;
+ break;
+ case DataBuffer.TYPE_DOUBLE:
+ double[] dData;
+ if (obj == null)
+ dData = new double[numDataEls];
+ else
+ dData = (double[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ dData[i] = data.getElemDouble(bankIndices[i],
+ offset + bandOffsets[i]);
+ }
+ obj = dData;
+ break;
}
return obj;
}
- /**
- * Sets the samples for the pixels in the region defined by
- * <code>(x, y, w, h)</code> from a supplied primitive array (the array type
- * must be consistent with the data type for this model).
- *
- * @param x the x-coordinate.
- * @param y the y-coordinate.
- * @param w the width.
- * @param h the height.
- * @param obj a primitive array containing the sample values.
- * @param data the data buffer (<code>null</code> not permitted).
- *
- * @see #getDataElements(int, int, int, int, Object, DataBuffer)
- */
- public void setDataElements(int x, int y, int w, int h,
- Object obj, DataBuffer data)
- {
- if (!tightPixelPacking)
- {
- super.setDataElements(x, y, w, h, obj, data);
- return;
- }
-
- // using set speedup, we can copy whole rows
- int rowSize = w * numBands;
- int dataSize = rowSize * h;
-
- DataBuffer transferBuffer
- = Buffers.createBufferFromData(getTransferType(), obj, dataSize);
-
- int[] bankOffsets = data.getOffsets();
-
- int outOffset = pixelStride * x + scanlineStride * y + bankOffsets[0];
- // same assumptions as in get...
-
- // See if we can copy everything in one go
- if (scanlineStride == rowSize)
- {
- // Collapse scan lines:
- rowSize *= h;
- h = 1;
- }
-
- int inOffset = 0;
- Object outArray = Buffers.getData(data);
- for (int yd = 0; yd < h; yd++)
- {
- System.arraycopy(obj, inOffset, outArray, outOffset, rowSize);
- outOffset += scanlineStride;
- inOffset += rowSize;
- }
- }
/**
* Returns all the samples for the pixel at location <code>(x, y)</code>
* stored in the specified data buffer.
*
* @param x the x-coordinate.
* @param y the y-coordinate.
* @param iArray an array that will be populated with the sample values and
* returned as the result. The size of this array should be equal to the
* number of bands in the model. If the array is <code>null</code>, a new
* array is created.
* @param data the data buffer (<code>null</code> not permitted).
*
* @return The samples for the specified pixel.
*
@@ -752,102 +593,75 @@
/**
* Sets the samples for the pixel at location <code>(x, y)</code> from the
* supplied primitive array (the array type must be consistent with the data
* type for this model).
*
* @param x the x-coordinate.
* @param y the y-coordinate.
* @param obj a primitive array containing the pixel's sample values.
* @param data the data buffer (<code>null</code> not permitted).
*
* @see #setDataElements(int, int, Object, DataBuffer)
*/
public void setDataElements(int x, int y, Object obj, DataBuffer data)
{
- int offset = pixelStride * x + scanlineStride * y;
- int[] totalBandDataOffsets = new int[numBands];
- int[] bankOffsets = data.getOffsets();
- for (int b = 0; b < numBands; b++)
- totalBandDataOffsets[b] = bandOffsets[b] + bankOffsets[bankIndices[b]]
- + offset;
-
- switch (getTransferType())
+ int type = getTransferType();
+ int numDataEls = getNumDataElements();
+ int offset = y * scanlineStride + x * pixelStride;
+ switch (type)
{
case DataBuffer.TYPE_BYTE:
- {
- DataBufferByte out = (DataBufferByte) data;
- byte[] in = (byte[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
- case DataBuffer.TYPE_USHORT:
- {
- DataBufferUShort out = (DataBufferUShort) data;
- short[] in = (short[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
+ byte[] bData = (byte[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ data.setElem(bankIndices[i], offset + bandOffsets[i],
+ ((int) bData[i]) & 0xFF);
+ }
+ break;
case DataBuffer.TYPE_SHORT:
- {
- DataBufferShort out = (DataBufferShort) data;
- short[] in = (short[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
+ case DataBuffer.TYPE_USHORT:
+ short[] sData = (short[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ data.setElem(bankIndices[i], offset + bandOffsets[i],
+ ((int) sData[i]) & 0xFFFF);
+ }
+ break;
case DataBuffer.TYPE_INT:
- {
- DataBufferInt out = (DataBufferInt) data;
- int[] in = (int[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
+ int[] iData = (int[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ data.setElem(bankIndices[i], offset + bandOffsets[i], iData[i]);
+ }
+ break;
case DataBuffer.TYPE_FLOAT:
- {
- DataBufferFloat out = (DataBufferFloat) data;
- float[] in = (float[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
+ float[] fData = (float[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ data.setElemFloat(bankIndices[i], offset + bandOffsets[i],
+ fData[i]);
+ }
+ break;
case DataBuffer.TYPE_DOUBLE:
- {
- DataBufferDouble out = (DataBufferDouble) data;
- double[] in = (double[]) obj;
-
- for (int b = 0; b < numBands; b++)
- out.getData(bankIndices[b])[totalBandDataOffsets[b]] = in[b];
-
- return;
- }
- default:
- throw new UnsupportedOperationException("transfer type not " +
- "implemented");
+ double[] dData = (double[]) obj;
+ for (int i = 0; i < numDataEls; i++)
+ {
+ data.setElemDouble(bankIndices[i], offset + bandOffsets[i],
+ dData[i]);
+ }
+ break;
}
}
/**
* Sets the sample values for the pixel at location <code>(x, y)</code>
* stored in the specified data buffer.
*
* @param x the x-coordinate.
* @param y the y-coordinate.
* @param iArray the pixel sample values (<code>null</code> not permitted).
* @param data the data buffer (<code>null</code> not permitted).
*
* @see #getPixel(int, int, int[], DataBuffer)
*/
public void setPixel(int x, int y, int[] iArray, DataBuffer data)
