[Geotools-commits] svn - r19316 - in geotools/branches/coverages_branch/trunk/gt/module: coverage/src/org/geotools/coverage/processing/operation render/src/org/geotools/renderer/lite

[<si...@sv...>]

Author: simboss
Date: 2006-04-28 03:00:11 -0700 (Fri, 28 Apr 2006)
New Revision: 19316

Modified:
   geotools/branches/coverages_branch/trunk/gt/module/coverage/src/org/ge=
otools/coverage/processing/operation/ScaledGridCoverage2D.java
   geotools/branches/coverages_branch/trunk/gt/module/render/src/org/geot=
ools/renderer/lite/GridCoverageRenderer.java
Log:
-fixed scale operation
-improved GridCoverageRenderer.java

Modified: geotools/branches/coverages_branch/trunk/gt/module/coverage/src=
/org/geotools/coverage/processing/operation/ScaledGridCoverage2D.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/branches/coverages_branch/trunk/gt/module/coverage/src/org/g=
eotools/coverage/processing/operation/ScaledGridCoverage2D.java	2006-04-2=
8 09:53:06 UTC (rev 19315)
+++ geotools/branches/coverages_branch/trunk/gt/module/coverage/src/org/g=
eotools/coverage/processing/operation/ScaledGridCoverage2D.java	2006-04-2=
8 10:00:11 UTC (rev 19316)
@@ -79,11 +79,12 @@
 		final RenderedImage sourceImage =3D sourceCoverage.getRenderedImage();
 		final int transferType =3D sourceImage.getSampleModel().getDataType();
 		if (!(interpolation instanceof InterpolationNearest)
-				&& transferType =3D=3D DataBuffer.TYPE_FLOAT) {
+				&& (transferType =3D=3D DataBuffer.TYPE_FLOAT || transferType =3D=3D=
 DataBuffer.TYPE_DOUBLE)) {
=20
 			Registry.setNativeAccelerationAllowed("Scale", false);
=20
-		}
+		} else
+			Registry.setNativeAccelerationAllowed("Scale", true);
=20
 		// ///////////////////////////////////////////////////////////////////=
//
 		//
@@ -97,10 +98,7 @@
 		pbjScale.setParameter("xTrans", yTrans);
 		pbjScale.setParameter("Interpolation", interpolation);
 		pbjScale.addSource(sourceImage);
-	=09
=20
-	=09
-
 		// ///////////////////////////////////////////////////////////////////=
//
 		//
 		// Preparing the new GridGeometry by scaling the old one.
@@ -141,18 +139,9 @@
 		// Creating final grid coverage.
 		//
 		// ///////////////////////////////////////////////////////////////////=
//
-		final PlanarImage image=3DOperationJAI.getJAI(hints).createNS(
-				"Scale", pbjScale, hints).createInstance();
-	=09
-	=09
+		final PlanarImage image =3D OperationJAI.getJAI(hints).createNS("Scale=
",
+				pbjScale, hints);
=20
-		if (!(interpolation instanceof InterpolationNearest)
-				&& transferType =3D=3D DataBuffer.TYPE_FLOAT) {
-
-			Registry.setNativeAccelerationAllowed("Scale", true);
-
-		}
-	=09
 		return new ScaledGridCoverage2D(image, sourceCoverage);
 	}
=20
@@ -175,7 +164,8 @@
 	/**
 	 * * Create a scaled coverage as requested.
 	 */
-	private ScaledGridCoverage2D(PlanarImage image, GridCoverage2D sourceCo=
verage) {
+	private ScaledGridCoverage2D(PlanarImage image,
+			GridCoverage2D sourceCoverage) {
 		super(sourceCoverage.getName(), image, new GridGeometry2D(
 				new GeneralGridRange(image), sourceCoverage.getEnvelope()),
 				sourceCoverage.getSampleDimensions(),

Modified: geotools/branches/coverages_branch/trunk/gt/module/render/src/o=
rg/geotools/renderer/lite/GridCoverageRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- geotools/branches/coverages_branch/trunk/gt/module/render/src/org/geo=
tools/renderer/lite/GridCoverageRenderer.java	2006-04-28 09:53:06 UTC (re=
v 19315)
+++ geotools/branches/coverages_branch/trunk/gt/module/render/src/org/geo=
tools/renderer/lite/GridCoverageRenderer.java	2006-04-28 10:00:11 UTC (re=
v 19316)
@@ -186,8 +186,7 @@
 		// from disk
 		croppedGridCoverage.prefetch(intersectionEnvelope.toRectangle2D());
=20
-		 ImageIO.write(croppedGridCoverage.geophysics(false).getRenderedImage(=
),
-		 "png", new File("C:/cropped.png"));
+	=09
=20
 		// ///////////////////////////////////////////////////////////////////
 		//