This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 6161022503c28d6440e99a0af2af340ae3df9228
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 18 20:25:33 2023 +0200
Fix some references in GeoTIFF documentation.
---
.../apache/sis/storage/geotiff/GridGeometryBuilder.java | 14 +++++++-------
.../org/apache/sis/storage/geotiff/ImageFileDirectory.java | 4 ++--
.../src/main/java/org/apache/sis/storage/geotiff/Tags.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
index 362b05333a..348afdfb27 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
@@ -105,8 +105,8 @@ final class GridGeometryBuilder extends GeoKeysLoader {
*
* <ul>
* <li>By a combination of a single {@link #modelTiePoints} with the 3
values given in
- * {@link Tags#ModelPixelScaleTag} as documented in the Javadoc of
that tag.</li>
- * <li>By a {@link Tags#ModelTransformation} giving all coefficients of
the 4×4 matrix}.
+ * {@code ModelPixelScaleTag} as documented in the Javadoc of that
tag.</li>
+ * <li>By a {@code ModelTransformationTag} giving all coefficients of
the 4×4 matrix}.
* Note that the third row and the third column have all their value
set to 0 if the
* space model (or the coordinate reference system) should be
two-dimensional.</li>
* <li>By building a non-linear transformation from all {@link
#modelTiePoints}.
@@ -118,8 +118,8 @@ final class GridGeometryBuilder extends GeoKeysLoader {
private MatrixSIS affine;
/**
- * {@code true} if {@link #affine} has been specified by a complete matrix
({@link Tags#ModelTransformation}),
- * or {@code false} if it has been specified by the scale factors only
({@link Tags#ModelPixelScaleTag}).
+ * {@code true} if {@link #affine} has been specified by a complete matrix
({@code ModelTransformationTag}),
+ * or {@code false} if it has been specified by the scale factors only
({@code ModelPixelScaleTag}).
*/
private boolean completeMatrixSpecified;
@@ -186,11 +186,11 @@ final class GridGeometryBuilder extends GeoKeysLoader {
/**
* If {@link #affine} has been specified with only the scale factor,
computes the translation terms now.
* If needed, this method computes the translation terms from the (usually
singleton) tie point.
- * This happen when the GeoTIFF file has a {@link Tags#ModelPixelScaleTag}
and {@link Tags#ModelTiePoints}.
+ * This happen when the GeoTIFF file has a {@code ModelPixelScaleTag} and
{@code ModelTiePointTag}.
* The latter should have a single record.
*
- * @return {@code true} on success (including nothing to compute), or
{@code false} if the computation attempt
- * failed because of missing {@link Tags#ModelTiePoints}.
+ * @return {@code true} on success (including nothing to compute), or
+ * {@code false} if the computation attempt failed because of
missing {@code ModelTiePointTag}.
*
* @see ImageFileDirectory#validateMandatoryTags()
*/
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
index ae69f06723..be107010df 100644
---
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
+++
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/ImageFileDirectory.java
@@ -872,7 +872,7 @@ final class ImageFileDirectory extends DataCube {
* The last matrix row (i.e. the last 4 values) should be [0 0 0
1].
* The row before should be [0 0 0 0] if the conversion is
two-dimensional.
* This block does not reduce the number of dimensions from 3 to 2.
- * Only one of `ModelPixelScaleTag` and `ModelTransformation`
should be used.
+ * Only one of `ModelPixelScaleTag` and `ModelTransformationTag`
should be used.
*/
case (short) TAG_MODEL_TRANSFORMATION: {
final Vector m = type.readVector(input(), count);
@@ -899,7 +899,7 @@ final class ImageFileDirectory extends DataCube {
* └ ┘
*
* This block sets the translation column to NaN, meaning that it
will need to be computed from
- * the tie point. Only one of `ModelPixelScaleTag` and
`ModelTransformation` should be used.
+ * the tie point. Only one of `ModelPixelScaleTag` and
`ModelTransformationTag` should be used.
*/
case (short) TAG_MODEL_PIXEL_SCALE: {
final Vector m = type.readVector(input(), count);
diff --git
a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
index 20a488f102..e354958278 100644
--- a/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
+++ b/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Tags.java
@@ -77,7 +77,7 @@ final class Tags {
* The sets that are most likely to be used (for the kind of data handled
by SIS) should be first.
*/
@SuppressWarnings({"unchecked", "rawtypes"})
- private static Supplier<TIFFTagSet>[] TAG_SETS = new Supplier[] {
+ private static final Supplier<TIFFTagSet>[] TAG_SETS = new Supplier[] {
javax.imageio.plugins.tiff.BaselineTIFFTagSet::getInstance,
javax.imageio.plugins.tiff.GeoTIFFTagSet::getInstance,
javax.imageio.plugins.tiff.ExifGPSTagSet::getInstance,
