You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/01/02 06:07:25 UTC
svn commit: r1554738 - in /sis:
branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/
branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/
branches/JDK7/core/sis-referencing/src/test/java/or...
Author: desruisseaux
Date: Thu Jan 2 05:07:24 2014
New Revision: 1554738
URL: http://svn.apache.org/r1554738
Log:
Added WKT formatting of matrix parameters.
Added:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java (with props)
sis/ip-review/LinearTransform.xhtml (with props)
sis/ip-review/rev/10796/LinearTransform.xhtml (with props)
sis/ip-review/rev/20874/LinearTransform.xhtml (with props)
Modified:
sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1554738&r1=1554737&r2=1554738&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java [UTF-8] Thu Jan 2 05:07:24 2014
@@ -37,6 +37,7 @@ import org.opengis.referencing.Identifie
import org.opengis.referencing.ReferenceIdentifier;
import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.Matrix;
import org.opengis.util.CodeList;
import org.apache.sis.measure.Units;
@@ -49,6 +50,7 @@ import org.apache.sis.util.resources.Err
import org.apache.sis.internal.util.Citations;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.AbstractIdentifiedObject;
+import org.apache.sis.referencing.operation.transform.LinearTransform;
/**
@@ -361,7 +363,7 @@ public class Formatter {
/**
* Increase or reduce the indentation. A value of {@code +1} increase
* the indentation by the amount of spaces specified at construction time,
- * and a value of {@code +1} reduce it.
+ * and a value of {@code -1} reduce it.
*/
private void indent(final int amount) {
margin = Math.max(0, margin + indentation*amount);
@@ -513,6 +515,14 @@ public class Formatter {
if (transform != null) {
if (transform instanceof FormattableObject) {
append((FormattableObject) transform);
+ } else if (transform instanceof LinearTransform) {
+ appendSeparator(true);
+ buffer.append("PARAM_MT").appendCodePoint(symbols.getOpeningBracket(0));
+ quote("Affine");
+ indent(+1);
+ append(((LinearTransform) transform).getMatrix());
+ indent(-1);
+ buffer.appendCodePoint(symbols.getClosingBracket(0));
} else {
throw new UnformattableObjectException(Errors.format(
Errors.Keys.IllegalClass_2, FormattableObject.class, transform.getClass()));
@@ -521,6 +531,52 @@ public class Formatter {
}
/**
+ * Appends a sequence of {@code PARAMETER[…]} elements for the given matrix.
+ * Only elements different than the default values are appended.
+ * The default values are 1 on the matrix diagonal and 0 elsewhere.
+ *
+ * @param matrix The matrix to append to the WKT, or {@code null} if none.
+ */
+ public void append(final Matrix matrix) {
+ if (matrix == null) {
+ return;
+ }
+ final int numRow = matrix.getNumRow();
+ final int numCol = matrix.getNumCol();
+ final int openingBracket = symbols.getOpeningBracket(0);
+ final int closingBracket = symbols.getClosingBracket(0);
+ final int openQuote = symbols.getOpenQuote();
+ final int closeQuote = symbols.getCloseQuote();
+ final String separator = symbols.getSeparator();
+ final StringBuffer buffer = this.buffer;
+ boolean columns = false;
+ do {
+ appendSeparator(true);
+ buffer.append("PARAMETER").appendCodePoint(openingBracket);
+ quote(columns ? "num_col" : "num_row");
+ buffer.append(separator);
+ format(columns ? numCol : numRow);
+ buffer.appendCodePoint(closingBracket);
+ } while ((columns = !columns) == true);
+ for (int j=0; j<numRow; j++) {
+ for (int i=0; i<numCol; i++) {
+ final double element = matrix.getElement(j, i);
+ if (element != (i == j ? 1 : 0)) {
+ appendSeparator(true);
+ buffer.append("PARAMETER").appendCodePoint(openingBracket);
+ setColor(ElementKind.PARAMETER);
+ buffer.appendCodePoint(openQuote).append("elt_").append(j)
+ .append('_').append(i).appendCodePoint(closeQuote);
+ resetColor();
+ buffer.append(separator);
+ format(element);
+ buffer.appendCodePoint(closingBracket);
+ }
+ }
+ }
+ }
+
+ /**
* Appends a {@linkplain ParameterValue parameter} in WKT form.
* If the supplied parameter is actually a {@linkplain ParameterValueGroup parameter group},
* all contained parameters will flattened in a single list.
Added: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java?rev=1554738&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java (added)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java [UTF-8] Thu Jan 2 05:07:24 2014
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.referencing.operation.transform;
+
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.referencing.operation.MathTransform;
+
+
+/**
+ * A {@link MathTransform} which convert coordinates using only linear equations.
+ * Such transform can be represented by a {@linkplain #getMatrix() matrix}.
+ * Those transforms are often affine, but not necessarily.
+ *
+ * <p>Relationships:</p>
+ * <ul>
+ * <li>The {@linkplain Matrix#getNumCol() number of columns} in the matrix is equal to
+ * the number of {@linkplain #getSourceDimensions() source dimensions} plus 1</li>
+ * <li>The {@linkplain Matrix#getNumRow() number of rows} in the matrix is equal to
+ * the number of {@linkplain #getTargetDimensions() target dimensions} plus 1.</li>
+ * </ul>
+ *
+ * @author Martin Desruisseaux (IRD, Geomatys)
+ * @since 0.4 (derived from geotk-2.0)
+ * @version 0.4
+ * @module
+ *
+ * @see org.apache.sis.referencing.operation.MathTransforms
+ */
+public interface LinearTransform extends MathTransform {
+ /**
+ * Returns the coefficients of this linear transform as a matrix.
+ * Converting a coordinate with this {@code MathTransform} is equivalent to multiplying the
+ * returned matrix by a vector containing the ordinate values with an additional 1 in the last row.
+ * For example if this transform converts projected coordinates (metres) to display coordinates (pixel),
+ * then the same conversions can be done by the returned matrix as below:
+ *
+ * <p><center><img src="../matrix/doc-files/AffineTransform.png"></center></p>
+ *
+ * @return The coefficients of this linear transform as a matrix.
+ */
+ Matrix getMatrix();
+}
Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8
Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java?rev=1554738&r1=1554737&r2=1554738&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/FormatterTest.java [UTF-8] Thu Jan 2 05:07:24 2014
@@ -16,12 +16,14 @@
*/
package org.apache.sis.io.wkt;
+import org.opengis.referencing.operation.Matrix;
+import org.apache.sis.referencing.operation.matrix.Matrix4;
import org.apache.sis.internal.util.X364;
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.apache.sis.referencing.Assert.*;
/**
@@ -42,4 +44,22 @@ public final strictfp class FormatterTes
assertEquals("FOREGROUND_DEFAULT", X364.FOREGROUND_DEFAULT.sequence(), Formatter.FOREGROUND_DEFAULT);
assertEquals("BACKGROUND_DEFAULT", X364.BACKGROUND_DEFAULT.sequence(), Formatter.BACKGROUND_DEFAULT);
}
+
+ /**
+ * Tests {@link Formatter#append(Matrix)}.
+ */
+ @Test
+ public void testAppendMatrix() {
+ final Formatter formatter = new Formatter();
+ formatter.append(new Matrix4(1, 0, 4, 0,
+ -2, 1, 0, 0,
+ 0, 0, 1, 7,
+ 0, 0, 0, 1));
+ assertWktEquals(
+ "PARAMETER[“num_row”, 4],\n" +
+ "PARAMETER[“num_col”, 4],\n" +
+ "PARAMETER[“elt_0_2”, 4.0],\n" +
+ "PARAMETER[“elt_1_0”, -2.0],\n" +
+ "PARAMETER[“elt_2_3”, 7.0]", formatter.toString());
+ }
}
Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java?rev=1554738&r1=1554737&r2=1554738&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/Assert.java [UTF-8] Thu Jan 2 05:07:24 2014
@@ -301,4 +301,22 @@ public strictfp class Assert extends org
assertMultilinesEquals(object.getName().getCode(), expected, object.toWKT());
}
}
+
+ /**
+ * Asserts that the given WKT is equal to the expected one. If the given expected string contains
+ * {@code '“'} and {@code '”'} characters (for easier reading), then those characters will be replaced
+ * by "ordinary" quote characters ({@code '"'}).
+ *
+ * @param expected The expected text, or {@code null} if {@code actual} is expected to be null.
+ * @param actual The actual <cite>Well Known Text</cite> to compare.
+ */
+ public static void assertWktEquals(String expected, final String actual) {
+ if (expected == null) {
+ assertNull(actual);
+ } else {
+ assertNotNull(actual);
+ expected = expected.replace('“', '"').replace('”', '"');
+ assertMultilinesEquals(expected, actual);
+ }
+ }
}
Added: sis/ip-review/LinearTransform.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/LinearTransform.xhtml?rev=1554738&view=auto
==============================================================================
--- sis/ip-review/LinearTransform.xhtml (added)
+++ sis/ip-review/LinearTransform.xhtml Thu Jan 2 05:07:24 2014
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>LinearTransform history</title>
+ <style type="text/css" media="all">
+ @import url("./reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>LinearTransform history</h1>
+ <p>Click on the commit message for inspecting the <code>diff</code> and how the code has been rewritten.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn log -r31996:1 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/LinearTransform.java</code></blockquote>
+<table>
+ <tr>
+ <th>Rev.</th>
+ <th>Date</th>
+ <th>Author</th>
+ <th class="last">Message</th>
+ </tr>
+<tr><td class="rev">30760</td><td>2008-06-18</td><td>desruisseaux</td><td>Upgrated from JSR-108 to JSR-275 (GEOT-1266). Some opportunist javadoc fixes and @Override annotations in the process.</td></tr>
+<tr><td class="rev">30641</td><td>2008-06-12</td><td>acuster</td><td>Copyright headers: lib/referencing, this time with feeling (and the el in Toolkit)</td></tr>
+<tr><td class="rev">30521</td><td>2008-06-05</td><td>acuster</td><td>Copyright: Update referencing headers</td></tr>
+<tr><td class="rev">30258</td><td>2008-05-08</td><td>acuster</td><td>Reshuffle the top level repo: drop uDig, move up trunk, tags, and branches.</td></tr>
+<tr><td class="rev">30257</td><td>2008-05-08</td><td>acuster</td><td>Move trunk/gt/ directory contents up to trunk/ and drop gt</td></tr>
+<tr><td class="rev">29753</td><td>2008-04-01</td><td>desruisseaux</td><td>Applied parameterized types as a side-effect of hunting for a DimensionMismatchException during reprojection.</td></tr>
+<tr><td class="rev">28922</td><td>2008-01-24</td><td>acuster</td><td>Bump the (at)since version to 2.5 since WKTParser was cut from 2.4</td></tr>
+<tr><td class="rev">28540</td><td>2007-12-29</td><td>acuster</td><td>Hide buttons which are not yet used</td></tr>
+<tr><td class="rev">27575</td><td>2007-10-22</td><td>desruisseaux</td><td>Converted Java source files from ISO-LATIN-1 encoding to UTF-8 (GEOT-1516).</td></tr>
+<tr><td class="rev">24510</td><td>2007-02-19</td><td>desruisseaux</td><td>Moved 'isIdentity(double tolerance)' method from AbstractMathTransform to LinearTransform interface.</td></tr>
+<tr><td class="rev">22327</td><td>2006-10-23</td><td>desruisseaux</td><td>GEOT-982: regroup 'module', 'plugin', 'ext' and 'unsupported' in a common directory.</td></tr>
+<tr><td class="rev">22315</td><td>2006-10-22</td><td>desruisseaux</td><td>Reorganisation of directory tree structure (GEOT-982) phase 1: moved 'src' to 'src/main/java'.</td></tr>
+<tr><td class="rev">20874</td><td>2006-08-07</td><td class="unav">jgarnett</td><td><a href="rev/20874/LinearTransform.xhtml">ip review</a></td></tr>
+<tr><td class="rev">17672</td><td>2006-01-19</td><td>desruisseaux</td><td>Added @source tag.</td></tr>
+<tr><td class="rev">17660</td><td>2006-01-18</td><td>desruisseaux</td><td>Fixed SVN attributes, including the addition of URL attribute.</td></tr>
+<tr><td class="rev">17522</td><td>2006-01-11</td><td>desruisseaux</td><td>Added a few experimental @tutorial javadoc tags.</td></tr>
+<tr><td class="rev">15350</td><td>2005-08-16</td><td>desruisseaux</td><td>Merged the 'split-main' branch to trunk (GEOT-662)</td></tr>
+<tr><td class="rev">15256</td><td>2005-08-09</td><td>desruisseaux</td><td>Extraction of referencing module from main</td></tr>
+<tr><td class="rev">15255</td><td>2005-08-09</td><td>desruisseaux</td><td>Prepare branch for splitting main</td></tr>
+<tr><td class="rev">14935</td><td>2005-07-27</td><td>desruisseaux</td><td>Added tests for 3D ProjectedCRS case, using custom axis orientations</td></tr>
+<tr><td class="rev">13925</td><td>2005-05-30</td><td>desruisseaux</td><td>Added @since javadoc tag</td></tr>
+<tr><td class="rev">11001</td><td>2005-02-02</td><td>desruisseaux</td><td>Fixed wrong encoding in main/src</td></tr>
+<tr><td class="rev">10796</td><td>2005-01-28</td><td class="unav">dzwiers</td><td><a href="rev/10796/LinearTransform.xhtml">imports cleaned</a></td></tr>
+<tr><td class="rev">10228</td><td>2005-01-04</td><td>desruisseaux</td><td>Renamed 'getDimSource' as 'getSourceDimension'</td></tr>
+<tr><td class="rev">6259</td><td>2004-05-31</td><td>desruisseaux</td><td>Added more implementations for Coverage support</td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: sis/ip-review/rev/10796/LinearTransform.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/10796/LinearTransform.xhtml?rev=1554738&view=auto
==============================================================================
--- sis/ip-review/rev/10796/LinearTransform.xhtml (added)
+++ sis/ip-review/rev/10796/LinearTransform.xhtml Thu Jan 2 05:07:24 2014
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>LinearTransform changes for revisions 10795:10796</title>
+ <style type="text/css" media="all">
+ @import url("../../reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>LinearTransform changes for revisions 10795:10796</h1>
+<p>Changes in this commit seem to be the result of some "<cite>auto reformat</cite>" tool execution.
+The <cite>Java</cite> - <cite>GeoAPI</cite> - <cite>GeoTools</cite> import ordering is altered,
+imports used only in Javadoc are lost and the encoding of non-ASCII characters is broken.
+This commit has been reverted, except for the removal of really unused imports which are keep removed.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r10795:10796 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/LinearTransform.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 10795</th><th>Revision 10796</th></tr>
+<tr><td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="del"> * (C) 2001, Institut de Recherche pour le Développement</span>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public</pre></td>
+<td><pre>/*
+ * Geotools 2 - OpenSource mapping toolkit
+ * (C) 2003, Geotools Project Managment Committee (PMC)
+<span class="add"> * (C) 2001, Institut de Recherche pour le D�veloppement</span>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public</pre></td></tr>
+<tr><td><pre>package org.geotools.referencing.operation;
+
+// OpenGIS dependencies
+import org.opengis.referencing.operation.Matrix;
+<span class="del">import org.opengis.referencing.operation.MathTransform;</span>
+
+
+/**</pre></td>
+<td><pre>package org.geotools.referencing.operation;
+
+// OpenGIS dependencies
+<span class="add">import org.opengis.referencing.operation.MathTransform;</span>
+import org.opengis.referencing.operation.Matrix;
+
+
+/**</pre></td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/rev/10796/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/rev/10796/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: sis/ip-review/rev/20874/LinearTransform.xhtml
URL: http://svn.apache.org/viewvc/sis/ip-review/rev/20874/LinearTransform.xhtml?rev=1554738&view=auto
==============================================================================
--- sis/ip-review/rev/20874/LinearTransform.xhtml (added)
+++ sis/ip-review/rev/20874/LinearTransform.xhtml Thu Jan 2 05:07:24 2014
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset="UTF-8"/>
+ <title>LinearTransform changes for revisions 20873:20874</title>
+ <style type="text/css" media="all">
+ @import url("../../reports.css");
+ </style>
+ </head>
+ <body>
+ <div>
+ <h1>LinearTransform changes for revisions 20873:20874</h1>
+<p>Changes in GeoTools header only. The removal of the "<cite>or (at your option) any later version</cite>" clause
+must be keep in Geotk for every classes having contribution from a developer other than those who accepted re-licensing.
+This header does not apply to Apache SIS, since the above-cited contributions are omitted.</p>
+<p><b>Command line:</b></p>
+<blockquote><code>svn diff --extensions "--unified --ignore-space-change --ignore-all-space --ignore-eol-style" -r20873:20874 http://svn.osgeo.org/geotools/trunk/modules/library/referencing/src/main/java/org/geotools/referencing/operation/LinearTransform.java</code></blockquote>
+<table class="changes">
+<tr><th>Revision 20873</th><th>Revision 20874</th></tr>
+<tr><td><pre>/*
+<span class="del"> * Geotools 2 - OpenSource mapping toolkit</span>
+<span class="del"> * (C) 2003, Geotools Project Managment Committee (PMC)</span>
+ * (C) 2001, 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
+<span class="del"> * License as published by the Free Software Foundation; either</span>
+<span class="del"> * version 2.1 of the License, or (at your option) any later version.</span>
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td>
+<td><pre>/*
+<span class="add"> * GeoTools - OpenSource mapping toolkit</span>
+<span class="add"> * http://geotools.org</span>
+<span class="add"> * (C) 2003-2006, GeoTools Project Managment Committee (PMC)</span>
+ * (C) 2001, 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
+<span class="add"> * License as published by the Free Software Foundation;</span>
+<span class="add"> * version 2.1 of the License.</span>
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</pre></td></tr>
+<tr><td><pre>* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+<span class="del">* You should have received a copy of the GNU Lesser General Public</span>
+<span class="del">* License along with this library; if not, write to the Free Software</span>
+<span class="del">* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</span>
+<span class="del">*</span>
+<span class="del">*</span>
+* This package contains documentation from OpenGIS specifications.
+* OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td>
+<td><pre>* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* This package contains documentation from OpenGIS specifications.
+* OpenGIS consortium's work is fully acknowledged here.
+*/</pre></td></tr>
+</table>
+ </div>
+ </body>
+</html>
Propchange: sis/ip-review/rev/20874/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/ip-review/rev/20874/LinearTransform.xhtml
------------------------------------------------------------------------------
svn:mime-type = text/html