
2004-03-12 Graydon Hoare <graydon@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes. * javax/swing/JComponent.java (paint): Use persistent double buffer. * javax/swing/JList.java (ListListener): Revalidate on changes. * javax/swing/JScrollPane.java: Reimplement. * javax/swing/JViewport.java: Reimplement. * javax/swing/ScrollPaneLayout.java: Reimplement. * javax/swing/ViewportLayout.java: Tidy up. * javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns. * javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement. * javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels. * javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of backing store only. 2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_wm_protocols_filter): New function. (window_focus_in_cb): Remove function. (window_focus_out_cb): Likewise. (window_focus_or_active_state_change_cb): New function. (create): Add filter that removes WM_TAKE_FOCUS client messages. (connectSignals): Don't attach handlers to focus-in-event or focus-out-event signals. Handle notify signal. 2004-03-11 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (gtkSetLabel): New native method declaration. (setLabel): Use gtkSetLabel. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method. 2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to black when color argument is null. 2004-03-10 Kim Ho <kho@redhat.com> * java/awt/Container.java: Remove check for drag events. 2004-03-10 Kim Ho <kho@redhat.com> * java/awt/Container.java: (visitChild): Remove candidate clip. Use the component clip to intersect. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: (handleEvent): Use the PaintEvent's clip. 2004-03-10 Kim Ho <kho@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java: (handleEvent): Don't set the clip for the Graphics object. 2004-03-09 Graydon Hoare <graydon@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c: Fix double <-> fixed macros, reset font transform. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c: Likewise. 2004-03-09�� Kim Ho <kho@redhat.com> * java/awt/Container.java: (visitChild): Move the x and y coordinate of the component rectangle to correct position. (handleEvent): Forward drag events to the pressed component. * javax/swing/plaf/basic/BasicScrollBarUI.java: Fix comments. (ArrowButtonListener::mousePressed): Stop the existing timer. (mouseDragged): Implement. (TrackListener::mousePressed): Only react if the press doesn't occur on the thumb, otherwise just set the offset. (TrackListener::mouseReleased): Unset the isAdjusting value. (createIncreaseIcon): Switch icon. (createDecreaseIcon): Switch icon. (calculatePreferredSize): Use width. (getThumbBounds): Use the top as the lower value. (layoutVScrollBar): Switch the button locations. (paintIncreaseHighlight): Paint correct side of thumb. (paintDecreaseHighlight): ditto. (valueForYPosition): Use top as the lower value. * javax/swing/plaf/basic/BasicSliderUI.java: Fix comments. (mouseDragged): Implement. (mousePressed): Only react when the thumb isn't pressed, otherwise just set offset. (mouseReleased): Handle a release of the thumb. (scrollDueToClickInTrack): Stop the timer first. * javax/swing/JProgressBar.java: (setString): Fix change condition. * javax/swing/JSeparator.java: Remove println's. 2004-03-08 David Jee <djee@redhat.com> * java/awt/image/AffineTransformOp.java: (filter): Use Graphics2D interface instead of directly using the GdkGraphics2D peer. 2004-03-05 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkButtonPeer.java (handleEvent): Action events are generated upon MOUSE_RELEASED. * java/awt/Container.java (acquireComponentForMouseEvent): Fixed. (handleEvent): Fixed. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (state_to_awt_mods_with_button_states): New method. (pre_event_handler): Fixed mouse event generation. 2004-03-05 Olga Rodimina <rodimina@redhat.com> gnu/java/awt/peer/gtk/GdkGraphics2D.java (GdkGraphics2D (BufferedImage)): Initialize pixmap associated with specified BufferedImage. (setPaint): Changed implementation of Texture Paint to use AffineTransformOp. * java/awt/image/AffineTransformOp.java (createCompatibleDestRaster): Throw RasterFormatException if resulting width or height of raster is 0. 2004-03-04 Olga Rodimina <rodimina@redhat.com> * java/awt/image/AffineTransformOp.java: Removed unnecessary field interpolationType. Formatted some of the lines to be consistent with the GNU style. (AffineTransformOp): Create new RenderingHints containing specified interpolation type. (createCompatibleDestImage): Implemented. (createCompatibleDestRaster): Implemented. (filter): Implemented. (getBounds2D(BufferedImage)): Implemented. (getBounds2D(Raster)): Implemented. (getInterpolationType): Get interpolation value from rendering hints. 2004-03-04 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): Check if child peers are null. 2004-03-04 Graydon Hoare <graydon@redhat.com> * testsuite/lib/libjava.exp (libjava_find_lib): Don't include .libs in -L option. (libjava_arguments): Add new libraries to argument list. 2004-03-04 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. * Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la, lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la. (misc_java_source_files): New macro. (swing_java_source_files): Likewise. (awt_java_source_files): Pruned. (applet_java_source_files): New macro. (beans_java_source_files): Likewise. (lib_java_applet_la_SOURCES): Likewise. (lib_java_awt_la_SOURCES): Likewise. (lib_javax_swing_la_SOURCES): Likewise. (lib_java_beans_la_SOURCES): Likewise. (all_java_object_files): Likewise. (%.lo: %.java): Use all_java_object_files. (all_java_source_files): Added new _SOURCES. (ordinary_java_source_files): Removed awt_java_source_files. 2004-03-02 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added java/awt/image/AffineTransformOp.java * Makefile.in: Re-generated. * java/awt/image/AffineTransformOp.java: New Class. 2004-03-01 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (setPaint): Interpret correctly TexturePaint's anchor rectangle. (drawImage): Fixed scale factors of the affine transform. 2004-02-27 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics.java (GdkGraphics(Component)): Inherit font from component. (drawString): Use font style. * gnu/java/awt/peer/gtk/GtkCheckboxPeer.java (gtkSetFont): New native method declaration. (setFont): New method. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (gtkSetFont): New native method declaration. (setFont): Call new native method gtkSetFont. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): For all child components who do not their fonts set, set their peers' fonts with this container's font. * gnu/java/awt/peer/gtk/GtkLabelPeer.java: Move all native method declarations to the top for readability. (gtkSetFont): New native method declaration. (setFont): New method. * java/awt/Component.java (setFont): Invalidate after setting the font. * java/awt/Container.java (invalidateTree): New method. (setFont): Invalidate the container tree after setting the font. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c (Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c (Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method. 2004-02-27 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (updateBufferedImage): New helper function. Updates BufferedImage in memory if it was changed. (draw): changed to update BufferedImage in memory after this drawing operation (fill): Ditto. (draw3DRect): Ditto. (fill3DRect): Ditto. (clearRect): Ditto. (drawRaster): Ditto. (drawImage) : Ditto. Update only in case of GtkOffScreenImage with no affine transformation. (drawGlyphVector): Ditto. 2004-02-26 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (isBufferedImageGraphics): New Helper function. Returns true if this graphics2d can be used to draw into buffered image and false otherwise. (updateImagePixels): New Helper function. Updates pixels in the BufferedImage. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c (getImagePixels): New function. Returns pixels of the buffered image associated with this Graphics2D. 2004-02-26 David Jee <djee@redhat.com> * java/awt/BorderLayout.java (layoutContainer): Fix width and height calculations to ensure that they're non-negative. * java/awt/Component.java (setBackground): If c is null, inherit from closest ancestor whose background color is set. 2004-02-26�� Kim Ho�� <kho@redhat.com> * Makefile.am: Add new files. * Makefile.in: Re-generate. * javax/swing/JProgressBar.java: (JProgressBar(int, int int)): Throw IllegalArgumentException if orientation is invalid. (JProgressBar(BoundedRangeModel)): Create ChangeListener and register it. UpdateUI. (getChangeListeners): Implement. (setModel): Reset ChangeListener. * javax/swing/JScrollBar.java: Implement. * javax/swing/JSeparator.java: Implement. * javax/swing/JSlider.java: (JSlider(int, int, int, int)): Throw IllegalArgumentException if orientation is invalid. (getChangeListeners): Fix method name. * javax/swing/SwingUtilities.java: (layoutCompoundLabel): If there is no text, set the text rectangle dimensions to 0. * javax/swing/plaf/basic/BasicButtonUI.java: (paint): If there is no text, don't paint it. * javax/swing/plaf/basic/BasicScrollBarUI.java: Implement. * javax/swing/plaf/basic/BasicSeparatorUI.java: Implement. * javax/swing/plaf/basic/BasicSliderUI.java: (propertyChange): If the model changes, change the listeners accordingly. 2004-02-25 Graydon Hoare <graydon@redhat.com> * javax/swing/AbstractButton.java: Add "final" qualifiers. * javax/swing/JList.java: Reimplement. * javax/swing/DefaultListSelectionModel.java: Reimplement. * javax/swing/plaf/basic/BasicListUI.java: Reimplement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values. * javax/swing/ListModel.java: Javadoc. * javax/swing/ListSelectionModel.java: Add missing methods. * javax/swing/AbstractListModel.java: Javadoc and corrections. * javax/swing/DefaultListModel.java: Javadoc and corrections. * javax/swing/ListModel.java: Javadoc and corrections. * javax/swing/DefaultListCellRenderer.java: Minor tidying. 2004-02-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer): Change default size to 12. * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer): Change default size to 12. (getClasspathFontPeer): Likewise. Set default name to "Default". * java/awt/Font.java (Font(Map)): Call Font(String,Map). (Font(String,Map)): If attrs is null, initialize it as an empty HashMap, which will ensure that the Font will get default attributes. 2004-02-25 David Jee <djee@redhat.com> * gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer(String,int)): Call the new constructor with size 1. (GtkFontPeer(String,int,int)): New constructor with size attribute. * gnu/java/awt/peer/gtk/GtkToolkit.java (getFontPeer(String,int)): Call the new overload method with size 1. (getFontPeer(String,int,int)): New method. Overloaded with size attribute. (getClasspathFontPeer): Set the size of the font. 2004-02-24 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (bimage): New field. (GdkGraphics2D): New Constructor. Constructs Graphics object that can be used to draw into the Buffered Image. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: (GdkGraphicsEnvironment): Fixed to include public keyword. (createGraphics): Implemented. * gnu/java/awt/peer/gtk/GtkToolkit.java (getLocalGraphicsEnvironment): Implemented. * java/awt/GraphicsEnvironment.java: (getLocalGraphicsEnvironment): Implemented. * java/awt/image/BufferedImage.java: (createGraphics): Implemented. 2004-02-24 David Jee <djee@redhat.com> * java/awt/Component.java (eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types. * java/awt/Container.java (addNotifyContainerChildren): Fix event enabling. 2004-02-23 Olga Rodimina <rodimina@redhat.com> * Makefile.am: Added gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java * Makefile.in: Re-generated. * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java: New Class. 2004-02-19 Kim Ho <kho@redhat.com> * Makefile.am: Add BasicProgressBarUI * Makefile.in: Regenerate. * javax/swing/JProgressBar.java: Re-implement. * javax/swing/plaf/basic/BasicLookAndFeel.java Add constants for JProgressBar. * javax/swing/plaf/basic/BasicProgressBarUI.java Implement. * javax/swing/plaf/basic/BasicSliderUI.java Change comments. (calculateGeometry): New method (paint): Remove unnecessary size calculations. 2004-02-18 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java (drawRaster): Fixed small error that caused imageToUser transformation to be set incorrectly. (toString): Implemented. 2004-02-18 David Jee <djee@redhat.com> * java/awt/CardLayout.java (addLayoutComponent): Show the first component added as the default. (removeLayoutComponent): After removing, show the next component. (gotoComponent): If there is only one component, show it and return. 2004-02-18 Kim Ho <kho@redhat.com> * javax/swing/JSlider.java: Re-order modifiers. * javax/swing/JLabel.java: Re-order modifiers. * javax/swing/JComponent.java: (addPropertyChangeListener): Implement. (removePropertyChangeListener): ditto. (firePropertyChangeEvent): ditto. 2004-02-17 David Jee <djee@redhat.com> * java/awt/Component.java (show): Dispatch ComponentEvent via system event queue. (hide): Likewise. (move): Likewise. (resize): Likewise. (reshape): Likewise. * java/awt/Window.java (setBoundsCallback): Likewise. 2004-02-17 David Jee <djee@redhat.com> * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds): Use gtk_widget_set_size_request() instead of the deprecated gtk_widget_set_usize(). 2004-02-17 Kim Ho <kho@redhat.com> * javax/swing/JSlider.java: Fix comments and make property strings constants. (createStandardLabels): Use the labels preferred size as bounds. * javax/swing/plaf/basic/BasicSliderUI.java Fix comments. (ScrollHandler::actionPerformed): Don't calculate the timer stop value. Let the MouseListeners find the stop location. (getPreferredHorizontalSize): Re-implement. (getPreferredVerticalSize): ditto. (getMinimumHorizontalSize): ditto. (getMinimumVerticalSize): ditto. (getPreferredSize): ditto. (getMinimumSize): ditto. (getMaximumSize): ditto. (paintTicks): Use doubles to find the tick location. (paintHorizontalLabel):�� Use preferredSize as initial width and height. (paintVerticalLabel): ditto. 2004-02-17 Kim Ho <kho@redhat.com> * javax/swing/JLabel.java: Changed property strings to constants. (DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY): New property. (setText): Change mnemonic index if text is too short. (setDisplayedMnemonicIndex): Fire property change event. (getDisplayedMnemonicIndex): Remove check against short text. 2004-02-17 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: (drawImage(img,xform,obs)): Invert xform before passing the xform to cairo. (drawImage(img,x,y,bgcolor,obs)): Implemented. (drawImage (img,x,y,w,h,bgcolor,obs)): Partly implemented. (drawImage (img,x,y,w,h,obs)): Implemented. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2, bgcolor,obs)): Partly implemented. (drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)): Implemented. * java/awt/image/BufferedImage.java: (copyData): if dest is null, create raster with same dimensions as the current image. 2004-02-16 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicLabelUI.java (getPreferredSize): Use layoutCL. * javax/swing/plaf/basic/BasicGraphicsUtils.java (getPreferredButtonSize): Start with empty view rect, layout using component's preferred alignment. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and List defaults. 2004-02-16 David Jee <djee@redhat.com> * java/awt/Component.java (show): Dispatch COMPONENT_SHOWN ComponentEvent. (hide): Dispatch COMPONENT_HIDDEN ComponentEvent. (move): Erase old bounds and repaint new bounds. Dispatch COMPONENT_MOVED ComponentEvent. (resize): Erase old bounds and repaint new bounds. Dispatch COMPONENT_RESIZED ComponentEvent. (reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED ComponentEvents. * java/awt/Window.java (setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED ComponentEvents. 2004-02-16 Olga Rodimina <rodimina@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphics2D.java: (setRenderingHint): Added implementation of Interpolation rendering hints. (setRenderingHints): Ditto. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c: (drawPixels): fixed to allow user to choose type of filtering that should be used when displaying images. (cairoSurfaceSetFilter): New method. Sets filter type for interpolation of pixel values. 2004-02-16 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (calcCellSizes): Rows or columns with zero sizes should still be considered for extra space distribution. 2004-02-16 Kim Ho <kho@redhat.com> * javax/swing/JLabel.java: Re-implement. * javax/swing/plaf/basic/BasicLabelUI.java Re-implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Added constant. 2004-02-16�� Kim Ho�� <kho@redhat.com> * javax/swing/JSlider.java: Fix indentation and comments. (setModel): Remove null check to conform with Sun's. (setOrientation): Throw exception if not HORIZONTAL or VERTICAL. (getInverted): Use private variable instead of ComponentOrientation. (setInverted): ditto. * javax/swing/plaf/basic/BasicSliderUI.java: Fix indentation and comments. (propertyChange): Remove check for inverted slider, handle in main paint. (getMinimumSize): Return preferred size. (getMaximumSize): ditto. (calculateFocusRect): Don't relocate rectangle. (drawInverted): Return XOR of the slider's inversion and the component's orientation. (paint): Update leftToRightCache 2004-02-13 David Jee <djee@redhat.com> * java/awt/GridBagLayout.java (GetLayoutInfo): Fix weight and size distribution. Relocate repeated code to helper methods. (sortBySpan): New helper method. (distributeSizeAndWeight): Likewise. (calcCellWeights): Likewise. (calcCellSizes): Add comments. 2004-02-13 David Jee <djee@redhat.com> * java/awt/Component.java (show): Only do something if component is invisible at the moment. (hide): Only do something if component is visible at the moment. (reshape): If lightweight, erase old bounds and repaint new bounds. 2004-02-13�� Kim Ho�� <kho@redhat.com> * Makefile.am: Updated for new file. * Makefile.in: Regenerated. * javax/swing/JSlider.java: Reimplement. * javax/swing/SwingUtilities.java (layoutCompoundLabel): Use icon height instead of width. (paintComponent): Implement. * javax/swing/plaf/basic/BasicLookAndFeel.java: Add JSlider defaults. * javax/swing/plaf/basic/BasicSliderUI.java: Implement. New file. From-SVN: r79607
639 lines
15 KiB
Java
639 lines
15 KiB
Java
/* Copyright (C) 2000, 2002, 2003 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;
|
|
|
|
import java.awt.Graphics;
|
|
import java.awt.Graphics2D;
|
|
import java.awt.GraphicsEnvironment;
|
|
import java.awt.Image;
|
|
import java.awt.Point;
|
|
import java.awt.Rectangle;
|
|
import java.awt.Transparency;
|
|
import java.awt.color.ColorSpace;
|
|
import java.util.Hashtable;
|
|
import java.util.Vector;
|
|
import gnu.java.awt.ComponentDataBlitOp;
|
|
|
|
/**
|
|
* A buffered image always starts at coordinates (0, 0).
|
|
*
|
|
* The buffered image is not subdivided into multiple tiles. Instead,
|
|
* the image consists of one large tile (0,0) with the width and
|
|
* height of the image. This tile is always considered to be checked
|
|
* out.
|
|
*
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
*/
|
|
public class BufferedImage extends Image
|
|
implements WritableRenderedImage
|
|
{
|
|
public static final int TYPE_CUSTOM = 0,
|
|
TYPE_INT_RGB = 1,
|
|
TYPE_INT_ARGB = 2,
|
|
TYPE_INT_ARGB_PRE = 3,
|
|
TYPE_INT_BGR = 4,
|
|
TYPE_3BYTE_BGR = 5,
|
|
TYPE_4BYTE_ABGR = 6,
|
|
TYPE_4BYTE_ABGR_PRE = 7,
|
|
TYPE_USHORT_565_RGB = 8,
|
|
TYPE_USHORT_555_RGB = 9,
|
|
TYPE_BYTE_GRAY = 10,
|
|
TYPE_USHORT_GRAY = 11,
|
|
TYPE_BYTE_BINARY = 12,
|
|
TYPE_BYTE_INDEXED = 13;
|
|
|
|
final static int[] bits3 = { 8, 8, 8 };
|
|
final static int[] bits4 = { 8, 8, 8 };
|
|
final static int[] bits1byte = { 8 };
|
|
final static int[] bits1ushort = { 16 };
|
|
|
|
final static int[] masks_int = { 0x00ff0000,
|
|
0x0000ff00,
|
|
0x000000ff,
|
|
DataBuffer.TYPE_INT };
|
|
final static int[] masks_565 = { 0xf800,
|
|
0x07e0,
|
|
0x001f,
|
|
DataBuffer.TYPE_USHORT};
|
|
final static int[] masks_555 = { 0x7c00,
|
|
0x03e0,
|
|
0x001f,
|
|
DataBuffer.TYPE_USHORT};
|
|
|
|
Vector observers;
|
|
|
|
public BufferedImage(int w, int h, int type)
|
|
{
|
|
ColorModel cm = null;
|
|
|
|
boolean alpha = false;
|
|
boolean premultiplied = false;
|
|
switch (type)
|
|
{
|
|
case TYPE_4BYTE_ABGR_PRE:
|
|
case TYPE_INT_ARGB_PRE:
|
|
premultiplied = true;
|
|
// fall through
|
|
case TYPE_INT_ARGB:
|
|
case TYPE_4BYTE_ABGR:
|
|
alpha = true;
|
|
}
|
|
|
|
ColorSpace cs = ColorSpace.getInstance(ColorSpace.CS_sRGB);
|
|
switch (type)
|
|
{
|
|
case TYPE_INT_RGB:
|
|
case TYPE_INT_ARGB:
|
|
case TYPE_INT_ARGB_PRE:
|
|
case TYPE_USHORT_565_RGB:
|
|
case TYPE_USHORT_555_RGB:
|
|
int[] masks = null;
|
|
switch (type)
|
|
{
|
|
case TYPE_INT_RGB:
|
|
case TYPE_INT_ARGB:
|
|
case TYPE_INT_ARGB_PRE:
|
|
masks = masks_int;
|
|
break;
|
|
case TYPE_USHORT_565_RGB:
|
|
masks = masks_565;
|
|
break;
|
|
case TYPE_USHORT_555_RGB:
|
|
masks = masks_555;
|
|
break;
|
|
}
|
|
|
|
cm = new DirectColorModel(cs,
|
|
32, // 32 bits in an int
|
|
masks[0], // r
|
|
masks[1], // g
|
|
masks[2], // b
|
|
alpha ? 0xff000000 : 0,
|
|
premultiplied,
|
|
masks[3] // data type
|
|
);
|
|
break;
|
|
|
|
case TYPE_INT_BGR:
|
|
String msg =
|
|
"FIXME: Programmer is confused. Why (and how) does a " +
|
|
"TYPE_INT_BGR image use ComponentColorModel to store " +
|
|
"8-bit values? Is data type TYPE_INT or TYPE_BYTE. What " +
|
|
"is the difference between TYPE_INT_BGR and TYPE_3BYTE_BGR?";
|
|
throw new UnsupportedOperationException(msg);
|
|
|
|
case TYPE_3BYTE_BGR:
|
|
case TYPE_4BYTE_ABGR:
|
|
case TYPE_4BYTE_ABGR_PRE:
|
|
case TYPE_BYTE_GRAY:
|
|
case TYPE_USHORT_GRAY:
|
|
int[] bits = null;
|
|
int dataType = DataBuffer.TYPE_BYTE;
|
|
switch (type) {
|
|
case TYPE_3BYTE_BGR:
|
|
bits = bits3;
|
|
break;
|
|
case TYPE_4BYTE_ABGR:
|
|
case TYPE_4BYTE_ABGR_PRE:
|
|
bits = bits4;
|
|
break;
|
|
case TYPE_BYTE_GRAY:
|
|
bits = bits1byte;
|
|
break;
|
|
case TYPE_USHORT_GRAY:
|
|
bits = bits1ushort;
|
|
dataType = DataBuffer.TYPE_USHORT;
|
|
break;
|
|
}
|
|
cm = new ComponentColorModel(cs, bits, alpha, premultiplied,
|
|
alpha ?
|
|
Transparency.TRANSLUCENT:
|
|
Transparency.OPAQUE,
|
|
dataType);
|
|
break;
|
|
case TYPE_BYTE_BINARY:
|
|
byte[] vals = { 0, (byte) 0xff };
|
|
cm = new IndexColorModel(8, 2, vals, vals, vals);
|
|
break;
|
|
case TYPE_BYTE_INDEXED:
|
|
String msg2 = "type not implemented yet";
|
|
throw new UnsupportedOperationException(msg2);
|
|
// FIXME: build color-cube and create color model
|
|
}
|
|
|
|
init(cm,
|
|
cm.createCompatibleWritableRaster(w, h),
|
|
premultiplied,
|
|
null, // no properties
|
|
type
|
|
);
|
|
}
|
|
|
|
public BufferedImage(int w, int h, int type,
|
|
IndexColorModel indexcolormodel)
|
|
{
|
|
if ((type != TYPE_BYTE_BINARY) && (type != TYPE_BYTE_INDEXED))
|
|
throw new IllegalArgumentException("type must be binary or indexed");
|
|
|
|
init(indexcolormodel,
|
|
indexcolormodel.createCompatibleWritableRaster(w, h),
|
|
false, // not premultiplied (guess)
|
|
null, // no properties
|
|
type);
|
|
}
|
|
|
|
public BufferedImage(ColorModel colormodel,
|
|
WritableRaster writableraster,
|
|
boolean premultiplied,
|
|
Hashtable properties)
|
|
{
|
|
init(colormodel, writableraster, premultiplied, properties,
|
|
TYPE_CUSTOM);
|
|
// TODO: perhaps try to identify type?
|
|
}
|
|
|
|
WritableRaster raster;
|
|
ColorModel colorModel;
|
|
Hashtable properties;
|
|
boolean isPremultiplied;
|
|
int type;
|
|
|
|
private void init(ColorModel cm,
|
|
WritableRaster writableraster,
|
|
boolean premultiplied,
|
|
Hashtable properties,
|
|
int type)
|
|
{
|
|
raster = writableraster;
|
|
colorModel = cm;
|
|
this.properties = properties;
|
|
isPremultiplied = premultiplied;
|
|
this.type = type;
|
|
}
|
|
|
|
//public void addTileObserver(TileObserver tileobserver) {}
|
|
|
|
public void coerceData(boolean premultiplied)
|
|
{
|
|
colorModel = colorModel.coerceData(raster, premultiplied);
|
|
}
|
|
|
|
public WritableRaster copyData(WritableRaster dest)
|
|
{
|
|
if (dest == null)
|
|
dest = raster.createCompatibleWritableRaster(getMinX(), getMinY(),
|
|
getWidth(),getHeight());
|
|
|
|
int x = dest.getMinX();
|
|
int y = dest.getMinY();
|
|
int w = dest.getWidth();
|
|
int h = dest.getHeight();
|
|
|
|
// create a src child that has the right bounds...
|
|
WritableRaster src =
|
|
raster.createWritableChild(x, y, w, h, x, y,
|
|
null // same bands
|
|
);
|
|
if (src.getSampleModel () instanceof ComponentSampleModel
|
|
&& dest.getSampleModel () instanceof ComponentSampleModel)
|
|
// Refer to ComponentDataBlitOp for optimized data blitting:
|
|
ComponentDataBlitOp.INSTANCE.filter(src, dest);
|
|
else
|
|
{
|
|
// slower path
|
|
int samples[] = src.getPixels (x, y, w, h, (int [])null);
|
|
dest.setPixels (x, y, w, h, samples);
|
|
}
|
|
return dest;
|
|
}
|
|
|
|
public Graphics2D createGraphics()
|
|
{
|
|
GraphicsEnvironment env;
|
|
env = GraphicsEnvironment.getLocalGraphicsEnvironment ();
|
|
return env.createGraphics (this);
|
|
}
|
|
|
|
public void flush() {
|
|
}
|
|
|
|
public WritableRaster getAlphaRaster()
|
|
{
|
|
return colorModel.getAlphaRaster(raster);
|
|
}
|
|
|
|
public ColorModel getColorModel()
|
|
{
|
|
return colorModel;
|
|
}
|
|
|
|
public Raster getData()
|
|
{
|
|
return copyData(null);
|
|
/* TODO: this might be optimized by returning the same
|
|
raster (not writable) as long as image data doesn't change. */
|
|
}
|
|
|
|
public Raster getData(Rectangle rectangle)
|
|
{
|
|
WritableRaster dest =
|
|
raster.createCompatibleWritableRaster(rectangle);
|
|
return copyData(dest);
|
|
}
|
|
|
|
public Graphics getGraphics()
|
|
{
|
|
return createGraphics();
|
|
}
|
|
|
|
public int getHeight()
|
|
{
|
|
return raster.getHeight();
|
|
}
|
|
|
|
public int getHeight(ImageObserver imageobserver)
|
|
{
|
|
return getHeight();
|
|
}
|
|
|
|
public int getMinTileX()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinTileY()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinX()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getMinY()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public int getNumXTiles()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
public int getNumYTiles()
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
public Object getProperty(String string)
|
|
{
|
|
if (properties == null)
|
|
return null;
|
|
return properties.get(string);
|
|
}
|
|
|
|
public Object getProperty(String string, ImageObserver imageobserver)
|
|
{
|
|
return getProperty(string);
|
|
}
|
|
|
|
|
|
public String[] getPropertyNames()
|
|
{
|
|
// FIXME: implement
|
|
return null;
|
|
}
|
|
|
|
public int getRGB(int x, int y)
|
|
{
|
|
Object rgbElem = raster.getDataElements(x, y,
|
|
null // create as needed
|
|
);
|
|
return colorModel.getRGB(rgbElem);
|
|
}
|
|
|
|
public int[] getRGB(int startX, int startY, int w, int h,
|
|
int[] rgbArray,
|
|
int offset, int scanlineStride)
|
|
{
|
|
if (rgbArray == null)
|
|
{
|
|
/*
|
|
000000000000000000
|
|
00000[#######----- [ = start
|
|
-----########----- ] = end
|
|
-----#######]00000
|
|
000000000000000000 */
|
|
int size = (h-1)*scanlineStride + w;
|
|
rgbArray = new int[size];
|
|
}
|
|
|
|
int endX = startX + w;
|
|
int endY = startY + h;
|
|
|
|
/* *TODO*:
|
|
Opportunity for optimization by examining color models...
|
|
|
|
Perhaps wrap the rgbArray up in a WritableRaster with packed
|
|
sRGB color model and perform optimized rendering into the
|
|
array. */
|
|
|
|
Object rgbElem = null;
|
|
for (int y=startY; y<endY; y++)
|
|
{
|
|
int xoffset = offset;
|
|
for (int x=startX; x<endX; x++)
|
|
{
|
|
int rgb;
|
|
rgbElem = raster.getDataElements(x, y, rgbElem);
|
|
rgb = colorModel.getRGB(rgbElem);
|
|
rgbArray[xoffset++] = rgb;
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
return rgbArray;
|
|
}
|
|
|
|
public WritableRaster getRaster()
|
|
{
|
|
return raster;
|
|
}
|
|
|
|
public SampleModel getSampleModel()
|
|
{
|
|
return raster.getSampleModel();
|
|
}
|
|
|
|
public ImageProducer getSource()
|
|
{
|
|
throw new UnsupportedOperationException("not implemented");
|
|
}
|
|
|
|
public Vector getSources()
|
|
{
|
|
return null;
|
|
}
|
|
|
|
public BufferedImage getSubimage(int x, int y, int w, int h)
|
|
{
|
|
WritableRaster subRaster =
|
|
getRaster().createWritableChild(x, y, w, h, 0, 0, null);
|
|
|
|
return new BufferedImage(getColorModel(),
|
|
subRaster,
|
|
isPremultiplied,
|
|
properties);
|
|
}
|
|
|
|
public Raster getTile(int tileX, int tileY)
|
|
{
|
|
return getWritableTile(tileX, tileY);
|
|
}
|
|
|
|
public int getTileGridXOffset()
|
|
{
|
|
return 0; // according to javadocs
|
|
}
|
|
|
|
public int getTileGridYOffset()
|
|
{
|
|
return 0; // according to javadocs
|
|
}
|
|
|
|
public int getTileHeight()
|
|
{
|
|
return getHeight(); // image is one big tile
|
|
}
|
|
|
|
public int getTileWidth()
|
|
{
|
|
return getWidth(); // image is one big tile
|
|
}
|
|
|
|
public int getType()
|
|
{
|
|
return type;
|
|
}
|
|
|
|
public int getWidth()
|
|
{
|
|
return raster.getWidth();
|
|
}
|
|
|
|
public int getWidth(ImageObserver imageobserver)
|
|
{
|
|
return getWidth();
|
|
}
|
|
|
|
public WritableRaster getWritableTile(int tileX, int tileY)
|
|
{
|
|
isTileWritable(tileX, tileY); // for exception
|
|
return raster;
|
|
}
|
|
|
|
private static final Point[] tileIndices = { new Point() };
|
|
|
|
public Point[] getWritableTileIndices()
|
|
{
|
|
return tileIndices;
|
|
}
|
|
|
|
public boolean hasTileWriters()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
public boolean isAlphaPremultiplied()
|
|
{
|
|
return isPremultiplied;
|
|
}
|
|
|
|
public boolean isTileWritable(int tileX, int tileY)
|
|
{
|
|
if ((tileX != 0) || (tileY != 0))
|
|
throw new ArrayIndexOutOfBoundsException("only tile is (0,0)");
|
|
return true;
|
|
}
|
|
|
|
public void releaseWritableTile(int tileX, int tileY)
|
|
{
|
|
isTileWritable(tileX, tileY); // for exception
|
|
}
|
|
|
|
//public void removeTileObserver(TileObserver tileobserver) {}
|
|
|
|
public void setData(Raster src)
|
|
{
|
|
int x = src.getMinX();
|
|
int y = src.getMinY();
|
|
int w = src.getWidth();
|
|
int h = src.getHeight();
|
|
|
|
// create a dest child that has the right bounds...
|
|
WritableRaster dest =
|
|
raster.createWritableChild(x, y, w, h, x, y,
|
|
null // same bands
|
|
);
|
|
|
|
if (src.getSampleModel () instanceof ComponentSampleModel
|
|
&& dest.getSampleModel () instanceof ComponentSampleModel)
|
|
|
|
// Refer to ComponentDataBlitOp for optimized data blitting:
|
|
ComponentDataBlitOp.INSTANCE.filter(src, dest);
|
|
else
|
|
{
|
|
// slower path
|
|
int samples[] = src.getPixels (x, y, w, h, (int [])null);
|
|
dest.setPixels (x, y, w, h, samples);
|
|
}
|
|
}
|
|
|
|
public void setRGB(int x, int y, int argb)
|
|
{
|
|
Object rgbElem = colorModel.getDataElements(argb, null);
|
|
raster.setDataElements(x, y, rgbElem);
|
|
}
|
|
|
|
public void setRGB(int startX, int startY, int w, int h,
|
|
int[] argbArray, int offset, int scanlineStride)
|
|
{
|
|
int endX = startX + w;
|
|
int endY = startY + h;
|
|
|
|
Object rgbElem = null;
|
|
for (int y=startY; y<endY; y++)
|
|
{
|
|
int xoffset = offset;
|
|
for (int x=startX; x<endX; x++)
|
|
{
|
|
int argb = argbArray[xoffset++];
|
|
rgbElem = colorModel.getDataElements(argb, rgbElem);
|
|
raster.setDataElements(x, y, rgbElem);
|
|
}
|
|
offset += scanlineStride;
|
|
}
|
|
}
|
|
|
|
public String toString()
|
|
{
|
|
StringBuffer buf;
|
|
|
|
buf = new StringBuffer(/* estimated length */ 120);
|
|
buf.append("BufferedImage@");
|
|
buf.append(Integer.toHexString(hashCode()));
|
|
buf.append(": type=");
|
|
buf.append(type);
|
|
buf.append(' ');
|
|
buf.append(colorModel);
|
|
buf.append(' ');
|
|
buf.append(raster);
|
|
|
|
return buf.toString();
|
|
}
|
|
|
|
|
|
/**
|
|
* Adds a tile observer. If the observer is already present, it receives
|
|
* multiple notifications.
|
|
*
|
|
* @param to The TileObserver to add.
|
|
*/
|
|
public void addTileObserver (TileObserver to)
|
|
{
|
|
if (observers == null)
|
|
observers = new Vector ();
|
|
|
|
observers.add (to);
|
|
}
|
|
|
|
/**
|
|
* Removes a tile observer. If the observer was not registered,
|
|
* nothing happens. If the observer was registered for multiple
|
|
* notifications, it is now registered for one fewer notification.
|
|
*
|
|
* @param to The TileObserver to remove.
|
|
*/
|
|
public void removeTileObserver (TileObserver to)
|
|
{
|
|
if (observers == null)
|
|
return;
|
|
|
|
observers.remove (to);
|
|
}
|
|
}
|