hello there, the following patch ensures that mvn install, when run on the trunk (rev. 22683) completes without error. pls. feel free to use unless a copyright assignment, for such a minor change, is required).
the ChangeLog entry (in GNU style) would look like so:
2006-11-10 Raif S. Naffah [EMAIL PROTECTED]
*
modules/library/coverage/src/main/java/org/geotools/coverage/processing/operation/Resampler2D.java:
Removed unused imports.
Re-ordered imports.
(reproject): Use RenderingHints(Map) constructor with null argument.
Use RenderingHints.add(RenderingHints) if/when hints is not null.
*
modules/library/coverage/src/main/java/org/geotools/coverage/processing/operation/Resampler2D.java:
Removed unused imports.
Re-ordered imports.
(fork): Use RenderingHints(Map) constructor with null argument.
Use RenderingHints.add(RenderingHints) if/when hints is not null.
(getRenderingHints): Likewise.
cheers;
rsn
Index: /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/coverage/processing/operation/Resampler2D.java =================================================================== --- /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/coverage/processing/operation/Resampler2D.java (revision 22683) +++ /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/coverage/processing/operation/Resampler2D.java (working copy) @@ -2,7 +2,7 @@ * GeoTools - OpenSource mapping toolkit * http://geotools.org * (C) 2003-2006, Geotools Project Managment Committee (PMC) - * (C) 2002, Institut de Recherche pour le D�veloppement + * (C) 2002, Institut de Recherche pour le D�veloppement * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,6 @@ package org.geotools.coverage.processing.operation; // J2SE dependencies -import java.awt.Rectangle; import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.DataBuffer; @@ -27,31 +26,18 @@ import java.util.logging.Level; import java.util.logging.LogRecord; -// JAI dependencies -import javax.media.jai.JAI; -import javax.media.jai.Warp; -import javax.media.jai.RenderedOp; -import javax.media.jai.PlanarImage; import javax.media.jai.ImageLayout; import javax.media.jai.Interpolation; import javax.media.jai.InterpolationNearest; - -// OpenGIS dependencies -import org.opengis.coverage.grid.GridRange; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.CoordinateOperationFactory; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.MathTransform2D; -import org.opengis.referencing.operation.MathTransformFactory; -import org.opengis.referencing.operation.TransformException; -import org.opengis.spatialschema.geometry.Envelope; +import javax.media.jai.JAI; +import javax.media.jai.PlanarImage; +import javax.media.jai.RenderedOp; +import javax.media.jai.Warp; -// Geotools dependencies import org.geotools.coverage.GridSampleDimension; +import org.geotools.coverage.grid.GeneralGridRange; import org.geotools.coverage.grid.GridCoverage2D; import org.geotools.coverage.grid.GridGeometry2D; -import org.geotools.coverage.grid.GeneralGridRange; import org.geotools.coverage.processing.AbstractProcessor; import org.geotools.coverage.processing.CannotReprojectException; import org.geotools.factory.Hints; @@ -56,20 +42,28 @@ import org.geotools.coverage.processing.CannotReprojectException; import org.geotools.factory.Hints; import org.geotools.geometry.GeneralEnvelope; +import org.geotools.image.jai.Registry; import org.geotools.referencing.CRS; import org.geotools.referencing.FactoryFinder; -import org.geotools.referencing.operation.matrix.GeneralMatrix; import org.geotools.referencing.operation.transform.DimensionFilter; +import org.geotools.referencing.operation.transform.IdentityTransform; import org.geotools.referencing.operation.transform.WarpTransform2D; -import org.geotools.referencing.operation.transform.IdentityTransform; import org.geotools.resources.XArray; +import org.geotools.resources.i18n.ErrorKeys; import org.geotools.resources.i18n.Errors; -import org.geotools.resources.i18n.ErrorKeys; import org.geotools.resources.i18n.Logging; import org.geotools.resources.i18n.LoggingKeys; import org.geotools.resources.image.ImageUtilities; -import org.geotools.image.jai.Registry; import org.geotools.util.NumberRange; +import org.opengis.coverage.grid.GridRange; +import org.opengis.referencing.FactoryException; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.opengis.referencing.operation.CoordinateOperationFactory; +import org.opengis.referencing.operation.MathTransform; +import org.opengis.referencing.operation.MathTransform2D; +import org.opengis.referencing.operation.MathTransformFactory; +import org.opengis.referencing.operation.TransformException; +import org.opengis.spatialschema.geometry.Envelope; /** * Implementation of the [EMAIL PROTECTED] Resample} operation. This implementation is @@ -394,8 +388,11 @@ RenderingHints targetHints = ImageUtilities .getRenderingHints(sourceImage); if (targetHints == null) { - targetHints = new RenderingHints(hints); - } else if (hints != null) { +// targetHints = new RenderingHints(hints); + targetHints = new RenderingHints(null); + } +// else + if (hints != null) { targetHints.add(hints); } ImageLayout layout = (ImageLayout) targetHints Index: /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java =================================================================== --- /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java (revision 22683) +++ /export/home/workspace/geotools/modules/library/coverage/src/main/java/org/geotools/image/ImageWorker.java (working copy) @@ -16,12 +16,27 @@ package org.geotools.image; // J2SE dependencies +import java.awt.HeadlessException; import java.awt.Image; -import java.awt.image.*; +import java.awt.RenderingHints; import java.awt.Transparency; -import java.awt.RenderingHints; -import java.awt.HeadlessException; import java.awt.color.ColorSpace; +import java.awt.image.ColorModel; +import java.awt.image.ComponentColorModel; +import java.awt.image.DataBuffer; +import java.awt.image.DirectColorModel; +import java.awt.image.IndexColorModel; +import java.awt.image.PackedColorModel; +import java.awt.image.RenderedImage; +import java.awt.image.SampleModel; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Iterator; + +import javax.imageio.IIOException; import javax.imageio.ImageIO; import javax.imageio.ImageWriter; import javax.imageio.spi.ImageWriterSpi; @@ -26,30 +41,38 @@ import javax.imageio.ImageWriter; import javax.imageio.spi.ImageWriterSpi; import javax.imageio.stream.ImageOutputStream; -import javax.imageio.IIOException; -import java.io.IOException; -import java.io.FileNotFoundException; -import java.io.File; -import java.util.Arrays; -import java.util.Iterator; -import java.lang.reflect.InvocationTargetException; - -// Image I/O and JAI dependencies -import javax.media.jai.*; -import javax.media.jai.operator.*; - - -import com.sun.media.jai.util.ImageUtil; +import javax.media.jai.ColorCube; +import javax.media.jai.IHSColorSpace; +import javax.media.jai.ImageLayout; +import javax.media.jai.JAI; +import javax.media.jai.KernelJAI; +import javax.media.jai.LookupTableJAI; +import javax.media.jai.ParameterBlockJAI; +import javax.media.jai.PlanarImage; +import javax.media.jai.ROI; +import javax.media.jai.RenderedOp; +import javax.media.jai.TileCache; +import javax.media.jai.operator.AndDescriptor; +import javax.media.jai.operator.BandCombineDescriptor; +import javax.media.jai.operator.BandSelectDescriptor; +import javax.media.jai.operator.BinarizeDescriptor; +import javax.media.jai.operator.ColorConvertDescriptor; +import javax.media.jai.operator.ExtremaDescriptor; +import javax.media.jai.operator.FormatDescriptor; +import javax.media.jai.operator.InvertDescriptor; +import javax.media.jai.operator.LookupDescriptor; +import javax.media.jai.operator.NullDescriptor; +import javax.media.jai.operator.OrDescriptor; +import javax.media.jai.operator.OrderedDitherDescriptor; +import javax.media.jai.operator.RescaleDescriptor; -// Geotools dependencies import org.geotools.factory.Hints; import org.geotools.resources.Arguments; +import org.geotools.resources.i18n.ErrorKeys; import org.geotools.resources.i18n.Errors; -import org.geotools.resources.i18n.ErrorKeys; import org.geotools.resources.image.ImageUtilities; - - +import com.sun.media.jai.util.ImageUtil; /** * Helper methods for applying JAI operations on an image. The image is specified at @@ -191,8 +214,9 @@ */ private ImageWorker fork(final RenderedImage image) { final ImageWorker worker = new ImageWorker(image); + worker.commonHints = new RenderingHints(null); if (commonHints!=null && !commonHints.isEmpty()) { - worker.commonHints = new RenderingHints(commonHints); + worker.commonHints.add(commonHints); } return worker; } @@ -270,7 +294,7 @@ /** * Set the <cite>region of interest</cite> (ROI). A [EMAIL PROTECTED] null} set the ROI to the whole - * [EMAIL PROTECTED] #image}. The ROI is used by statistical m�thods like [EMAIL PROTECTED] #getMinimums} + * [EMAIL PROTECTED] #image}. The ROI is used by statistical m�thods like [EMAIL PROTECTED] #getMinimums} * and [EMAIL PROTECTED] #getMaximums}. * * @return This ImageWorker @@ -357,9 +381,13 @@ public RenderingHints getRenderingHints() { RenderingHints hints = ImageUtilities.getRenderingHints(image); if (hints == null) { - hints = new RenderingHints(commonHints); - } else if (commonHints != null) { - hints.putAll(commonHints); +// hints = new RenderingHints(commonHints); + hints = new RenderingHints(null); + } +// else + if (commonHints != null) { +// hints.putAll(commonHints); + hints.add(commonHints); } if (Boolean.FALSE.equals(hints.get(TILING_ALLOWED))) { final ImageLayout layout = getImageLayout(hints);
pgp8AAulxnlyj.pgp
Description: PGP signature
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________ Geotools-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
