diff options
Diffstat (limited to 'java/awt/image')
61 files changed, 207 insertions, 174 deletions
diff --git a/java/awt/image/AffineTransformOp.java b/java/awt/image/AffineTransformOp.java index 1326a61c0..f11066e4e 100644 --- a/java/awt/image/AffineTransformOp.java +++ b/java/awt/image/AffineTransformOp.java @@ -16,8 +16,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/AreaAveragingScaleFilter.java b/java/awt/image/AreaAveragingScaleFilter.java index f2e6ea54c..b9ca1b707 100644 --- a/java/awt/image/AreaAveragingScaleFilter.java +++ b/java/awt/image/AreaAveragingScaleFilter.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/BandCombineOp.java b/java/awt/image/BandCombineOp.java index 4c921ede9..79efb02e7 100644 --- a/java/awt/image/BandCombineOp.java +++ b/java/awt/image/BandCombineOp.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/BandedSampleModel.java b/java/awt/image/BandedSampleModel.java index 68a4466ee..24d315a1c 100644 --- a/java/awt/image/BandedSampleModel.java +++ b/java/awt/image/BandedSampleModel.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation +/* Copyright (C) 2004, 2005, Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -53,9 +53,17 @@ public final class BandedSampleModel extends ComponentSampleModel private int numberOfBits; private int numElems; + private static int[] createBankArray(int size) + { + int[] result = new int[size]; + for (int i = 0; i < size; i++) + result[i] = i; + return result; + } + public BandedSampleModel(int dataType, int w, int h, int numBands) { - super(dataType, w, h, 1, w, new int[numBands]); + this(dataType, w, h, w, createBankArray(numBands), new int[numBands]); } public BandedSampleModel(int dataType, int w, int h, int scanlineStride, @@ -103,6 +111,10 @@ public final class BandedSampleModel extends ComponentSampleModel public SampleModel createSubsetSampleModel(int[] bands) { + if (bands.length > bankIndices.length) + throw new + RasterFormatException("BandedSampleModel createSubsetSampleModel too" + +" many bands"); int[] newoff = new int[bands.length]; int[] newbanks = new int[bands.length]; for (int i=0; i < bands.length; i++) @@ -112,11 +124,6 @@ public final class BandedSampleModel extends ComponentSampleModel newbanks[i] = bankIndices[b]; } - if (bands.length > bankIndices.length) - throw new - RasterFormatException("BandedSampleModel createSubsetSampleModel too" - +" many bands"); - return new BandedSampleModel(dataType, width, height, scanlineStride, newbanks, newoff); } @@ -192,7 +199,7 @@ public final class BandedSampleModel extends ComponentSampleModel { if (iArray == null) iArray = new int[numBands]; for (int i=0; i < numBands; i++) - iArray[i] = getSample(x, y, 0, data); + iArray[i] = getSample(x, y, i, data); return iArray; } @@ -223,13 +230,15 @@ public final class BandedSampleModel extends ComponentSampleModel { if (iArray == null) iArray = new int[w*h*numBands]; int outOffset = 0; - for (y=0; y<h; y++) + int maxX = x + w; + int maxY = y + h; + for (int yy = x; yy < maxY; yy++) { - for (x=0; x<w;) + for (int xx = x; xx < maxX; xx++) { - for (int b=0; b < numBands; b++) + for (int b = 0; b < numBands; b++) { - int offset = bandOffsets[b] + y * scanlineStride + x; + int offset = bandOffsets[b] + yy * scanlineStride + xx; iArray[outOffset++] = data.getElem(bankIndices[b], offset); } @@ -281,11 +290,13 @@ public final class BandedSampleModel extends ComponentSampleModel { if (iArray == null) iArray = new int[w*h]; int outOffset = 0; - for (y=0; y<h; y++) + int maxX = x + w; + int maxY = y + h; + for (int yy = y; yy < maxY; yy++) { - for (x=0; x<w;) + for (int xx = x; xx < maxX; xx++) { - int offset = bandOffsets[b] + y * scanlineStride + x; + int offset = bandOffsets[b] + yy * scanlineStride + xx; iArray[outOffset++] = data.getElem(bankIndices[b], offset); } @@ -328,7 +339,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferByte out = (DataBufferByte) data; byte[] in = (byte[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } case DataBuffer.TYPE_SHORT: @@ -336,7 +347,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferShort out = (DataBufferShort) data; short[] in = (short[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } case DataBuffer.TYPE_USHORT: @@ -344,7 +355,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferUShort out = (DataBufferUShort) data; short[] in = (short[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } case DataBuffer.TYPE_INT: @@ -352,7 +363,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferInt out = (DataBufferInt) data; int[] in = (int[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } case DataBuffer.TYPE_FLOAT: @@ -360,7 +371,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferFloat out = (DataBufferFloat) data; float[] in = (float[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } case DataBuffer.TYPE_DOUBLE: @@ -368,7 +379,7 @@ public final class BandedSampleModel extends ComponentSampleModel DataBufferDouble out = (DataBufferDouble) data; double[] in = (double[]) obj; for (int i=0; i < numBands; i++) - out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[0]; + out.getData(bankIndices[i])[offset + bandOffsets[i]] = in[i]; return; } default: diff --git a/java/awt/image/BufferStrategy.java b/java/awt/image/BufferStrategy.java index 3a92cdf2a..e86aad60f 100644 --- a/java/awt/image/BufferStrategy.java +++ b/java/awt/image/BufferStrategy.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/BufferedImage.java b/java/awt/image/BufferedImage.java index b3ba12c8e..124b81368 100644 --- a/java/awt/image/BufferedImage.java +++ b/java/awt/image/BufferedImage.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/BufferedImageFilter.java b/java/awt/image/BufferedImageFilter.java index 8fa7d473f..50d627d66 100644 --- a/java/awt/image/BufferedImageFilter.java +++ b/java/awt/image/BufferedImageFilter.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/BufferedImageOp.java b/java/awt/image/BufferedImageOp.java index b1b7575df..2ecbec056 100644 --- a/java/awt/image/BufferedImageOp.java +++ b/java/awt/image/BufferedImageOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ByteLookupTable.java b/java/awt/image/ByteLookupTable.java index 8bea284e9..df02d0a1b 100644 --- a/java/awt/image/ByteLookupTable.java +++ b/java/awt/image/ByteLookupTable.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ColorConvertOp.java b/java/awt/image/ColorConvertOp.java index 5fcb37cc7..18609e0c4 100644 --- a/java/awt/image/ColorConvertOp.java +++ b/java/awt/image/ColorConvertOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ColorModel.java b/java/awt/image/ColorModel.java index 11615fdad..1ebcb98a7 100644 --- a/java/awt/image/ColorModel.java +++ b/java/awt/image/ColorModel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ComponentColorModel.java b/java/awt/image/ComponentColorModel.java index 2b065328e..f56688f93 100644 --- a/java/awt/image/ComponentColorModel.java +++ b/java/awt/image/ComponentColorModel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ComponentSampleModel.java b/java/awt/image/ComponentSampleModel.java index 86161e0ae..953f63c1e 100644 --- a/java/awt/image/ComponentSampleModel.java +++ b/java/awt/image/ComponentSampleModel.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ConvolveOp.java b/java/awt/image/ConvolveOp.java index 92a629beb..9b89b6519 100644 --- a/java/awt/image/ConvolveOp.java +++ b/java/awt/image/ConvolveOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -177,11 +177,13 @@ public class ConvolveOp implements BufferedImageOp, RasterOp } /** + * Returns (a clone of) the convolution kernel. + * * @return The convolution kernel. */ public Kernel getKernel() { - return kernel; + return (Kernel) kernel.clone(); } /* (non-Javadoc) diff --git a/java/awt/image/CropImageFilter.java b/java/awt/image/CropImageFilter.java index a006d26d8..490f43cd7 100644 --- a/java/awt/image/CropImageFilter.java +++ b/java/awt/image/CropImageFilter.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/DataBuffer.java b/java/awt/image/DataBuffer.java index 6f0215b10..9e4f71418 100644 --- a/java/awt/image/DataBuffer.java +++ b/java/awt/image/DataBuffer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -46,43 +46,43 @@ package java.awt.image; public abstract class DataBuffer { /** - * A constant representng a data type that uses <code>byte</code> primitives + * A constant representing a data type that uses <code>byte</code> primitives * as the storage unit. */ public static final int TYPE_BYTE = 0; /** - * A constant representng a data type that uses <code>short</code> + * A constant representing a data type that uses <code>short</code> * primitives as the storage unit. */ public static final int TYPE_USHORT = 1; /** - * A constant representng a data type that uses <code>short</code> + * A constant representing a data type that uses <code>short</code> * primitives as the storage unit. */ public static final int TYPE_SHORT = 2; /** - * A constant representng a data type that uses <code>int</code> + * A constant representing a data type that uses <code>int</code> * primitives as the storage unit. */ public static final int TYPE_INT = 3; /** - * A constant representng a data type that uses <code>float</code> + * A constant representing a data type that uses <code>float</code> * primitives as the storage unit. */ public static final int TYPE_FLOAT = 4; /** - * A constant representng a data type that uses <code>double</code> + * A constant representing a data type that uses <code>double</code> * primitives as the storage unit. */ public static final int TYPE_DOUBLE = 5; /** - * A constant representng an undefined data type. + * A constant representing an undefined data type. */ public static final int TYPE_UNDEFINED = 32; diff --git a/java/awt/image/DataBufferByte.java b/java/awt/image/DataBufferByte.java index a306ede6f..1113ebb78 100644 --- a/java/awt/image/DataBufferByte.java +++ b/java/awt/image/DataBufferByte.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -47,6 +47,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>byte</code> primitives + * to represent each of its banks. + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public final class DataBufferByte extends DataBuffer diff --git a/java/awt/image/DataBufferDouble.java b/java/awt/image/DataBufferDouble.java index c6d1e100d..a8c4b9d05 100644 --- a/java/awt/image/DataBufferDouble.java +++ b/java/awt/image/DataBufferDouble.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation +/* Copyright (C) 2004, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -47,6 +47,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>double</code> primitives + * to represent each of its banks. + * * @since 1.4 * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) @@ -226,7 +229,7 @@ public final class DataBufferDouble */ public void setElem(int i, int val) { - data[i+offset] = (double) val; + data[i+offset] = val; } /** @@ -240,7 +243,7 @@ public final class DataBufferDouble */ public void setElem(int bank, int i, int val) { - bankData[bank][i+offsets[bank]] = (double) val; + bankData[bank][i+offsets[bank]] = val; } public float getElemFloat(int i) diff --git a/java/awt/image/DataBufferFloat.java b/java/awt/image/DataBufferFloat.java index 6b47e2be0..9cf8784d7 100644 --- a/java/awt/image/DataBufferFloat.java +++ b/java/awt/image/DataBufferFloat.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation +/* Copyright (C) 2004, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -47,6 +47,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>float</code> primitives + * to represent each of its banks. + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) * @author Sascha Brawer (brawer@dandelis.ch) */ @@ -224,7 +227,7 @@ public final class DataBufferFloat */ public void setElem(int i, int val) { - data[i+offset] = (float) val; + data[i+offset] = val; } /** @@ -238,7 +241,7 @@ public final class DataBufferFloat */ public void setElem(int bank, int i, int val) { - bankData[bank][i+offsets[bank]] = (float) val; + bankData[bank][i+offsets[bank]] = val; } public float getElemFloat(int i) diff --git a/java/awt/image/DataBufferInt.java b/java/awt/image/DataBufferInt.java index c90f95588..0aac94040 100644 --- a/java/awt/image/DataBufferInt.java +++ b/java/awt/image/DataBufferInt.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -47,6 +47,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>int</code> primitives + * to represent each of its banks. + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public final class DataBufferInt extends DataBuffer diff --git a/java/awt/image/DataBufferShort.java b/java/awt/image/DataBufferShort.java index a8d8cb5ef..5c67a8d3c 100644 --- a/java/awt/image/DataBufferShort.java +++ b/java/awt/image/DataBufferShort.java @@ -1,5 +1,5 @@ /* DataBufferShort.java -- - Copyright (C) 2004 Free Software Foundation + Copyright (C) 2004, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -48,6 +48,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>short</code> primitives + * to represent each of its banks. + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public final class DataBufferShort extends DataBuffer diff --git a/java/awt/image/DataBufferUShort.java b/java/awt/image/DataBufferUShort.java index 7466d8579..981e9e9d2 100644 --- a/java/awt/image/DataBufferUShort.java +++ b/java/awt/image/DataBufferUShort.java @@ -1,5 +1,5 @@ /* DataBufferUShort.java -- - Copyright (C) 2000, 2002, 2004 Free Software Foundation + Copyright (C) 2000, 2002, 2004, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -48,6 +48,9 @@ package java.awt.image; code is a maintenance nightmare. */ /** + * A {@link DataBuffer} that uses an array of <code>short</code> primitives + * to represent each of its banks. + * * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public final class DataBufferUShort extends DataBuffer diff --git a/java/awt/image/DirectColorModel.java b/java/awt/image/DirectColorModel.java index da39fc931..c98c3f8ea 100644 --- a/java/awt/image/DirectColorModel.java +++ b/java/awt/image/DirectColorModel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/FilteredImageSource.java b/java/awt/image/FilteredImageSource.java index 8f64f897f..8893e86a6 100644 --- a/java/awt/image/FilteredImageSource.java +++ b/java/awt/image/FilteredImageSource.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ImageConsumer.java b/java/awt/image/ImageConsumer.java index 9ac67d5cf..e1834c397 100644 --- a/java/awt/image/ImageConsumer.java +++ b/java/awt/image/ImageConsumer.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ImageFilter.java b/java/awt/image/ImageFilter.java index f58e5381d..9940a2b1b 100644 --- a/java/awt/image/ImageFilter.java +++ b/java/awt/image/ImageFilter.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ImageObserver.java b/java/awt/image/ImageObserver.java index 738e08a1f..36dd013f4 100644 --- a/java/awt/image/ImageObserver.java +++ b/java/awt/image/ImageObserver.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ImageProducer.java b/java/awt/image/ImageProducer.java index 47530f123..49846685a 100644 --- a/java/awt/image/ImageProducer.java +++ b/java/awt/image/ImageProducer.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ImagingOpException.java b/java/awt/image/ImagingOpException.java index 0018dc47c..ca40e9ed3 100644 --- a/java/awt/image/ImagingOpException.java +++ b/java/awt/image/ImagingOpException.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/IndexColorModel.java b/java/awt/image/IndexColorModel.java index 3dafe5b53..299b4dc0d 100644 --- a/java/awt/image/IndexColorModel.java +++ b/java/awt/image/IndexColorModel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/Kernel.java b/java/awt/image/Kernel.java index 2bc82ee74..f7c29c3cd 100644 --- a/java/awt/image/Kernel.java +++ b/java/awt/image/Kernel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/LookupOp.java b/java/awt/image/LookupOp.java index 523aba451..f131daaba 100644 --- a/java/awt/image/LookupOp.java +++ b/java/awt/image/LookupOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/LookupTable.java b/java/awt/image/LookupTable.java index 497cdb6e0..f814b8e09 100644 --- a/java/awt/image/LookupTable.java +++ b/java/awt/image/LookupTable.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/MemoryImageSource.java b/java/awt/image/MemoryImageSource.java index 6b43d00c3..c27e0bf73 100644 --- a/java/awt/image/MemoryImageSource.java +++ b/java/awt/image/MemoryImageSource.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/MultiPixelPackedSampleModel.java b/java/awt/image/MultiPixelPackedSampleModel.java index ab971c0e6..18a6e5552 100644 --- a/java/awt/image/MultiPixelPackedSampleModel.java +++ b/java/awt/image/MultiPixelPackedSampleModel.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/PackedColorModel.java b/java/awt/image/PackedColorModel.java index 457dded93..894e6e66f 100644 --- a/java/awt/image/PackedColorModel.java +++ b/java/awt/image/PackedColorModel.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/PixelGrabber.java b/java/awt/image/PixelGrabber.java index 9a68a0847..b576dbfad 100644 --- a/java/awt/image/PixelGrabber.java +++ b/java/awt/image/PixelGrabber.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/PixelInterleavedSampleModel.java b/java/awt/image/PixelInterleavedSampleModel.java index 1c0408cd1..4c5c436ed 100644 --- a/java/awt/image/PixelInterleavedSampleModel.java +++ b/java/awt/image/PixelInterleavedSampleModel.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/RGBImageFilter.java b/java/awt/image/RGBImageFilter.java index ca88d70e3..f7b39b97b 100644 --- a/java/awt/image/RGBImageFilter.java +++ b/java/awt/image/RGBImageFilter.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -147,12 +147,14 @@ public abstract class RGBImageFilter extends ImageFilter public void filterRGBPixels(int x, int y, int w, int h, int[] pixels, int offset, int scansize) { - for (int xp = x; xp < (x + w); xp++) - for (int yp = y; yp < (y + h); yp++) - { - pixels[offset] = filterRGB(xp, yp, pixels[offset]); - offset++; - } + for (int yp = 0; yp < h; yp++) + { + for (int xp = 0; xp < w; xp++) + { + pixels[offset + xp] = filterRGB(xp + x, yp + y, pixels[offset + xp]); + } + offset += scansize; + } } @@ -212,9 +214,9 @@ public abstract class RGBImageFilter extends ImageFilter else { //FIXME: Store the filtered pixels in a separate temporary buffer? - convertColorModelToDefault( x, y, w, h, model, pixels, offset, scansize ); - filterRGBPixels( x, y, w, h, pixels, offset, scansize ); - consumer.setPixels(x, y, w, h, ColorModel.getRGBdefault(), pixels, offset, scansize); + convertColorModelToDefault( x, y, w, h, model, pixels, offset, scansize ); + filterRGBPixels( x, y, w, h, pixels, offset, scansize ); + consumer.setPixels(x, y, w, h, ColorModel.getRGBdefault(), pixels, offset, scansize); } } diff --git a/java/awt/image/Raster.java b/java/awt/image/Raster.java index c3cb07fb2..4af958a17 100644 --- a/java/awt/image/Raster.java +++ b/java/awt/image/Raster.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/RasterFormatException.java b/java/awt/image/RasterFormatException.java index 4cfc5b5dc..582c2ae5a 100644 --- a/java/awt/image/RasterFormatException.java +++ b/java/awt/image/RasterFormatException.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/RasterOp.java b/java/awt/image/RasterOp.java index c40c7a82b..e081ca3d2 100644 --- a/java/awt/image/RasterOp.java +++ b/java/awt/image/RasterOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/RenderedImage.java b/java/awt/image/RenderedImage.java index f38b44a94..b35f86021 100644 --- a/java/awt/image/RenderedImage.java +++ b/java/awt/image/RenderedImage.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/ReplicateScaleFilter.java b/java/awt/image/ReplicateScaleFilter.java index 091909d5b..3841e49d5 100644 --- a/java/awt/image/ReplicateScaleFilter.java +++ b/java/awt/image/ReplicateScaleFilter.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/RescaleOp.java b/java/awt/image/RescaleOp.java index cc892b677..35b42f79c 100644 --- a/java/awt/image/RescaleOp.java +++ b/java/awt/image/RescaleOp.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/SampleModel.java b/java/awt/image/SampleModel.java index b0d12c0ea..257e30a5b 100644 --- a/java/awt/image/SampleModel.java +++ b/java/awt/image/SampleModel.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 2000, 2001, 2002, 2005 Free Software Foundation This file is part of GNU Classpath. @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and @@ -236,7 +236,7 @@ public abstract class SampleModel { for (int xx=x; xx<(x+w); xx++) { - getPixel(xx, yy, pixel, data); + pixel = getPixel(xx, yy, pixel, data); System.arraycopy(pixel, 0, iArray, outOffset, numBands); outOffset += numBands; } @@ -257,7 +257,7 @@ public abstract class SampleModel { for (int xx=x; xx<(x+w); xx++) { - getPixel(xx, yy, pixel, data); + pixel = getPixel(xx, yy, pixel, data); System.arraycopy(pixel, 0, fArray, outOffset, numBands); outOffset += numBands; } @@ -278,7 +278,7 @@ public abstract class SampleModel { for (int xx=x; xx<(x+w); xx++) { - getPixel(xx, yy, pixel, data); + pixel = getPixel(xx, yy, pixel, data); System.arraycopy(pixel, 0, dArray, outOffset, numBands); outOffset += numBands; } diff --git a/java/awt/image/ShortLookupTable.java b/java/awt/image/ShortLookupTable.java index c57abeba7..5915a7939 100644 --- a/java/awt/image/ShortLookupTable.java +++ b/java/awt/image/ShortLookupTable.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/SinglePixelPackedSampleModel.java b/java/awt/image/SinglePixelPackedSampleModel.java index 32789fc63..6ccce753b 100644 --- a/java/awt/image/SinglePixelPackedSampleModel.java +++ b/java/awt/image/SinglePixelPackedSampleModel.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/TileObserver.java b/java/awt/image/TileObserver.java index b76217870..99aafbce8 100644 --- a/java/awt/image/TileObserver.java +++ b/java/awt/image/TileObserver.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/VolatileImage.java b/java/awt/image/VolatileImage.java index a615e41f3..308654162 100644 --- a/java/awt/image/VolatileImage.java +++ b/java/awt/image/VolatileImage.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/WritableRaster.java b/java/awt/image/WritableRaster.java index de3648af5..2e5462fd9 100644 --- a/java/awt/image/WritableRaster.java +++ b/java/awt/image/WritableRaster.java @@ -14,8 +14,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/WritableRenderedImage.java b/java/awt/image/WritableRenderedImage.java index 657d6fdb6..4ed9f1013 100644 --- a/java/awt/image/WritableRenderedImage.java +++ b/java/awt/image/WritableRenderedImage.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/package.html b/java/awt/image/package.html index 53ae8da6a..50fa99d13 100644 --- a/java/awt/image/package.html +++ b/java/awt/image/package.html @@ -16,8 +16,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/ContextualRenderedImageFactory.java b/java/awt/image/renderable/ContextualRenderedImageFactory.java index 41f07714a..729d857ac 100644 --- a/java/awt/image/renderable/ContextualRenderedImageFactory.java +++ b/java/awt/image/renderable/ContextualRenderedImageFactory.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/ParameterBlock.java b/java/awt/image/renderable/ParameterBlock.java index a54209d32..879d3c4fb 100644 --- a/java/awt/image/renderable/ParameterBlock.java +++ b/java/awt/image/renderable/ParameterBlock.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/RenderContext.java b/java/awt/image/renderable/RenderContext.java index 81d84a45e..67f0b8adb 100644 --- a/java/awt/image/renderable/RenderContext.java +++ b/java/awt/image/renderable/RenderContext.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/RenderableImage.java b/java/awt/image/renderable/RenderableImage.java index c953914c6..45d2eb7eb 100644 --- a/java/awt/image/renderable/RenderableImage.java +++ b/java/awt/image/renderable/RenderableImage.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/RenderableImageOp.java b/java/awt/image/renderable/RenderableImageOp.java index ac7cadfeb..5385a82a3 100644 --- a/java/awt/image/renderable/RenderableImageOp.java +++ b/java/awt/image/renderable/RenderableImageOp.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/RenderableImageProducer.java b/java/awt/image/renderable/RenderableImageProducer.java index 15ec571bc..78f3051ea 100644 --- a/java/awt/image/renderable/RenderableImageProducer.java +++ b/java/awt/image/renderable/RenderableImageProducer.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/RenderedImageFactory.java b/java/awt/image/renderable/RenderedImageFactory.java index 0d5627739..6ff4cb031 100644 --- a/java/awt/image/renderable/RenderedImageFactory.java +++ b/java/awt/image/renderable/RenderedImageFactory.java @@ -15,8 +15,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and diff --git a/java/awt/image/renderable/package.html b/java/awt/image/renderable/package.html index eaa41d344..a24237e72 100644 --- a/java/awt/image/renderable/package.html +++ b/java/awt/image/renderable/package.html @@ -16,8 +16,8 @@ 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. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and |