mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-29 08:24:49 +08:00
3bd483f2a1
* Makefile.in: Rebuilt. * Makefile.am (awt_java_source_files): Reference files in gnu/java/awt, not gnu/gcj/awt. * java/awt/image/BufferedImage.java: Updated copyright. * java/awt/image/ComponentColorModel.java: Updated copyright. * java/awt/image/ComponentSampleModel.java: Updated copyright. * java/awt/image/DataBuffer.java: Updated copyright. * java/awt/image/DataBufferByte.java: Updated copyright. * java/awt/image/DataBufferInt.java: Updated copyright. * java/awt/image/DataBufferUShort.java: Updated copyright. * java/awt/image/IndexColorModel.java: Updated copyright. * java/awt/image/PackedColorModel.java: Updated copyright. * java/awt/image/Raster.java: Updated copyright. * java/awt/image/RasterOp.java: Updated copyright. * java/awt/image/SampleModel.java: Updated copyright. * java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright. * java/awt/image/WritableRaster.java: Updated copyright. * java/awt/color/ColorSpace.java: Updated copyright. * java/awt/color/ICC_ColorSpace.java: Updated copyright * java/awt/color/ICC_Profile.java: Updated copyright. * java/awt/event/HierarchyBoundsAdapter.java: Updated copyright. * java/awt/event/HierarchyBoundsListener.java: Updated copyright. * java/awt/event/HierarchyEvent.java: Updated copyright. * java/awt/event/HierarchyListener.java: Updated copyright. * java/awt/geom/AffineTransform.java: Updated copyright. * java/awt/geom/Dimension2D.java: Updated copyright. * java/awt/geom/Ellipse2D.java: Updated copyright. * java/awt/geom/IllegalPathStateException.java: Updated copyright. * java/awt/geom/Line2D.java: Updated copyright. * java/awt/geom/NoninvertibleTransformException.java: Updated copyright. * java/awt/geom/PathIterator.java: Updated copyright. * java/awt/geom/Point2D.java: Updated copyright. * java/awt/geom/Rectangle2D.java: Updated copyright. * java/awt/geom/RectangularShape.java: Updated copyright. * java/awt/geom/RoundRectangle2D.java: Updated copyright. * java/awt/Toolkit.java: Updated import for file moves. * java/awt/Rectangle.java: Updated copyright; added javadoc from Classpath. (hashCode): New method from Classpath. * java/awt/Graphics2D.java: Updated copyright. * java/awt/Transparency.java: Updated copyright. * java/awt/Paint.java: Updated copyright. * java/awt/Graphics.java: New version from Classpath. * java/awt/EventDispatchThread.java: Updated copyright. * java/awt/CardLayout.java (layoutContainer): Don't skip invisible children. (gotoComponent): Wrap around on next/previous. * gnu/gcj/awt/BitMaskExtent.java: Removed. * gnu/gcj/awt/Buffers.java: Removed. * gnu/gcj/awt/ComponentDataBlitOp.java: Removed. * gnu/gcj/awt/GLightweightPeer.java: Removed. * gnu/java/awt/BitMaskExtent.java: Added. * gnu/java/awt/Buffers.java: Added. * gnu/java/awt/ComponentDataBlitOp.java: Added. * gnu/java/awt/GLightweightPeer.java: Added. * java/awt/geom/Line2D.java (clone): Ignore CloneNotSupportedException. * gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method. * java/awt/Frame.java: Merged with Classpath. * java/awt/RenderingHints.java: Copyright update. * java/awt/Paint.java: Copyright update. * java/awt/image/DirectColorModel.java: Merged with Classpath. * java/awt/image/ColorModel.java: Merged with Classpath. * java/awt/Window.java (show): New Implementation from Classpath. (isShowing): Use super.isShowing(). * java/awt/EventQueue.java: Merged with Classpath. * java/awt/AWTEventMulticaster.java (save): Throw RuntimeException. (saveInternal): Likewise. * java/awt/AWTEvent.java: Now implements Serializable. * java/awt/Event.java: Copyright update. * java/awt/peer/ComponentPeer.java: Merged with Classpath. * java/awt/image/BufferedImage.java: Copyright update. * java/awt/GraphicsConfiguration.java: Copyright update. * java/awt/Component.java: (addNotify): Don't call addNotifyContainerChildren(). (addNotifyContainerChildren): Removed. (setPeer): New method from Classpath. (setTreeLock): Likewise. (setVisible): Rewrote. (show): Use it. (hide): Likewise. (validate): Set `valid'. (checkImage(Image,ImageObserver)): Implementation from Classpath. (createImage(ImageProducer)): Likewise. (prepareImage): Likewise. * java/awt/Container.java (addImpl): Handle case where constraint is not a String. Post event via system event queue. (remove): Post event via system event queue. (validateTree): Only validate child if it is invalid. (getAlignmentX): Call super method as default. (getAlignmentY): Likewise. (addContainerListener): Now synchronized. (removeContainerListener): Likewise. (addNotifyContainerChildren): Now private. * java/awt/ComponentOrientation.java: Updated copyright. Added @author. * java/awt/FlowLayout.java (serialVersionUID): New field. (setAlignment): Better exception message. (layoutContainer): Don't compute component's preferred size unless we're going to use it. * java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS, BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants. (firstLine, lastLine, firstItem, lastItem): New fields. (addLayoutComponent): Handle case where constraints is null. Also, handle relative locations. (removeLayoutComponent): Handle relative locations. (MIN, MAX, PREF): New constants. (calcCompSize): New method. (calcSize): New method. (minimumLayoutSize): Use it. (preferredLayoutSize): Likewise. (maximumLayoutSize): Likewise. (toString): Include more information. (setBounds): New method. (layoutContainer): Use libgcj implementation; extended to handle relative locations. From-SVN: r48896
263 lines
6.7 KiB
Java
263 lines
6.7 KiB
Java
/* Copyright (C) 2000, 2002 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.
|
|
|
|
As a special exception, if you link this library with other files to
|
|
produce an executable, this library does not by itself cause the
|
|
resulting executable to be covered by the GNU General Public License.
|
|
This exception does not however invalidate any other reasons why the
|
|
executable file might be covered by the GNU General Public License. */
|
|
|
|
package java.awt.image;
|
|
|
|
import gnu.java.awt.BitMaskExtent;
|
|
import gnu.java.awt.Buffers;
|
|
|
|
/**
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
*/
|
|
public class SinglePixelPackedSampleModel extends SampleModel
|
|
{
|
|
private int scanlineStride;
|
|
private int[] bitMasks;
|
|
private int[] bitOffsets;
|
|
private int[] sampleSize;;
|
|
|
|
public SinglePixelPackedSampleModel(int dataType, int w, int h,
|
|
int[] bitMasks)
|
|
{
|
|
this(dataType, w, h, w, bitMasks);
|
|
}
|
|
|
|
public SinglePixelPackedSampleModel(int dataType, int w, int h,
|
|
int scanlineStride, int[] bitMasks)
|
|
{
|
|
super(dataType, w, h, bitMasks.length);
|
|
|
|
this.scanlineStride = scanlineStride;
|
|
this.bitMasks = bitMasks;
|
|
|
|
bitOffsets = new int[numBands];
|
|
sampleSize = new int[numBands];
|
|
|
|
BitMaskExtent extent = new BitMaskExtent();
|
|
for (int b=0; b<numBands; b++)
|
|
{
|
|
extent.setMask(bitMasks[b]);
|
|
sampleSize[b] = extent.bitWidth;
|
|
bitOffsets[b] = extent.leastSignificantBit;
|
|
}
|
|
}
|
|
|
|
public int getNumDataElements()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
public SampleModel createCompatibleSampleModel(int w, int h)
|
|
{
|
|
/* FIXME: We can avoid recalculation of bit offsets and sample
|
|
sizes here by passing these from the current instance to a
|
|
special private constructor. */
|
|
return new SinglePixelPackedSampleModel(dataType, w, h, bitMasks);
|
|
}
|
|
|
|
public DataBuffer createDataBuffer()
|
|
{
|
|
// Important: use scanlineStride here, not width!
|
|
int size = scanlineStride*height;
|
|
return Buffers.createBuffer(getDataType(), size);
|
|
}
|
|
|
|
public int[] getSampleSize()
|
|
{
|
|
return sampleSize;
|
|
}
|
|
|
|
public int getSampleSize(int band)
|
|
{
|
|
return sampleSize[band];
|
|
}
|
|
|
|
public int getOffset(int x, int y)
|
|
{
|
|
return scanlineStride*y + x;
|
|
}
|
|
|
|
public int[] getBitOffsets()
|
|
{
|
|
return bitOffsets;
|
|
}
|
|
|
|
public int[] getBitMasks()
|
|
{
|
|
return bitMasks;
|
|
}
|
|
|
|
public int getScanlineStride()
|
|
{
|
|
return scanlineStride;
|
|
}
|
|
|
|
public SampleModel createSubsetSampleModel(int[] bands)
|
|
{
|
|
// FIXME: Is this the right way to interpret bands?
|
|
|
|
int numBands = bands.length;
|
|
|
|
int[] bitMasks = new int[numBands];
|
|
|
|
for (int b=0; b<numBands; b++)
|
|
bitMasks[b] = this.bitMasks[bands[b]];
|
|
|
|
return new SinglePixelPackedSampleModel(dataType, width, height,
|
|
scanlineStride, bitMasks);
|
|
}
|
|
|
|
public Object getDataElements(int x, int y, Object obj,
|
|
DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x + data.getOffset();
|
|
|
|
return Buffers.getData(data, offset, obj,
|
|
0, // destination offset,
|
|
1 // length
|
|
);
|
|
}
|
|
|
|
public int[] getPixel(int x, int y, int[] iArray, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
if (iArray == null) iArray = new int[numBands];
|
|
int samples = data.getElem(offset);
|
|
|
|
for (int b=0; b<numBands; b++)
|
|
iArray[b] = (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
|
|
return iArray;
|
|
}
|
|
|
|
public int[] getPixels(int x, int y, int w, int h, int[] iArray,
|
|
DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
if (iArray == null) iArray = new int[numBands*w*h];
|
|
int outOffset = 0;
|
|
for (y=0; y<h; y++)
|
|
{
|
|
int lineOffset = offset;
|
|
for (x=0; x<w; x++)
|
|
{
|
|
int samples = data.getElem(lineOffset++);
|
|
for (int b=0; b<numBands; b++)
|
|
iArray[outOffset++] = (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
return iArray;
|
|
}
|
|
|
|
public int getSample(int x, int y, int b, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
int samples = data.getElem(offset);
|
|
return (samples & bitMasks[b]) >>> bitOffsets[b];
|
|
}
|
|
|
|
public void setDataElements(int x, int y, Object obj, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x + data.getOffset();
|
|
|
|
int transferType = getTransferType();
|
|
if (getTransferType() != data.getDataType())
|
|
{
|
|
throw new IllegalArgumentException("transfer type ("+
|
|
getTransferType()+"), "+
|
|
"does not match data "+
|
|
"buffer type (" +
|
|
data.getDataType() +
|
|
").");
|
|
}
|
|
|
|
try
|
|
{
|
|
switch (transferType)
|
|
{
|
|
case DataBuffer.TYPE_BYTE:
|
|
{
|
|
DataBufferByte out = (DataBufferByte) data;
|
|
byte[] in = (byte[]) obj;
|
|
out.getData()[offset] = in[0];
|
|
return;
|
|
}
|
|
case DataBuffer.TYPE_USHORT:
|
|
{
|
|
DataBufferUShort out = (DataBufferUShort) data;
|
|
short[] in = (short[]) obj;
|
|
out.getData()[offset] = in[0];
|
|
return;
|
|
}
|
|
case DataBuffer.TYPE_INT:
|
|
{
|
|
DataBufferInt out = (DataBufferInt) data;
|
|
int[] in = (int[]) obj;
|
|
out.getData()[offset] = in[0];
|
|
return;
|
|
}
|
|
// FIXME: Fill in the other possible types.
|
|
default:
|
|
throw new InternalError();
|
|
}
|
|
}
|
|
catch (ArrayIndexOutOfBoundsException aioobe)
|
|
{
|
|
String msg = "While writing data elements" +
|
|
", x="+x+", y="+y+
|
|
", width="+width+", height="+height+
|
|
", scanlineStride="+scanlineStride+
|
|
", offset="+offset+
|
|
", data.getSize()="+data.getSize()+
|
|
", data.getOffset()="+data.getOffset()+
|
|
": " +
|
|
aioobe;
|
|
throw new ArrayIndexOutOfBoundsException(msg);
|
|
}
|
|
}
|
|
|
|
public void setPixel(int x, int y, int[] iArray, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
|
|
int samples = 0;
|
|
for (int b=0; b<numBands; b++)
|
|
samples |= (iArray[b] << bitOffsets[b]) & bitMasks[b];
|
|
|
|
data.setElem(offset, samples);
|
|
}
|
|
|
|
public void setSample(int x, int y, int b, int s, DataBuffer data)
|
|
{
|
|
int offset = scanlineStride*y + x;
|
|
int samples = data.getElem(offset);
|
|
int bitMask = bitMasks[b];
|
|
samples &= ~bitMask;
|
|
samples |= (s << bitOffsets[b]) & bitMask;
|
|
data.setElem(offset, samples);
|
|
}
|
|
}
|