This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 61f9c7be796e7afa669501a21e0be7693821c981
Merge: a546a473a8 947dfd9042
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Aug 15 21:06:28 2022 +0200
Merge branch 'geoapi-3.1'.
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../sis/gui/coverage/StyledRenderingData.java | 2 +-
.../java/org/apache/sis/image/ImageProcessor.java | 2 +-
.../sis/internal/feature/j2d/MultiPolylines.java | 13 +-
.../sis/internal/feature/j2d/PathBuilder.java | 13 +-
.../apache/sis/internal/feature/j2d/Polyline.java | 13 +-
.../sis/internal/feature/j2d/package-info.java | 2 +-
.../internal/processing/image/IsolineTracer.java | 1261 --------------------
.../internal/processing/image/TiledProcess.java | 6 +-
.../internal/processing/image/package-info.java | 2 +-
.../sis/internal/processing/isoline/Fragments.java | 274 +++++
.../processing/{image => isoline}/Isolines.java | 248 ++--
.../sis/internal/processing/isoline/Joiner.java | 168 +++
.../internal/processing/isoline/Parallelized.java | 112 ++
.../processing/isoline/PolylineBuffer.java | 210 ++++
.../internal/processing/isoline/PolylineStage.java | 116 ++
.../sis/internal/processing/isoline/Result.java | 101 ++
.../sis/internal/processing/isoline/Tracer.java | 739 ++++++++++++
.../{image => isoline}/package-info.java | 6 +-
.../org/apache/sis/image/ImageProcessorTest.java | 4 +-
.../{image => isoline}/IsolinesTest.java | 2 +-
.../internal/processing/isoline/StepsViewer.java | 426 +++++++
.../apache/sis/test/suite/FeatureTestSuite.java | 2 +-
.../apache/sis/metadata/iso/DefaultMetadata.java | 5 +-
.../sis/referencing/AbstractIdentifiedObject.java | 4 +
.../sis/referencing/AbstractReferenceSystem.java | 2 +
.../apache/sis/referencing/crs/AbstractCRS.java | 3 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 109 +-
.../sis/referencing/crs/DefaultGeodeticCRS.java | 6 +-
.../sis/referencing/crs/DefaultImageCRS.java | 5 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 1 +
.../referencing/crs/DefaultEngineeringCRSTest.java | 100 +-
33 files changed, 2435 insertions(+), 1526 deletions(-)
diff --cc
core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
index d8703f35e7,76c642c072..4f966b9d20
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/processing/isoline/Isolines.java
@@@ -30,14 -30,14 +30,14 @@@ import java.awt.image.RenderedImage
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.image.PixelIterator;
++import org.apache.sis.image.SequenceType;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
- import org.apache.sis.util.resources.Errors;
- import org.apache.sis.image.SequenceType;
+ import org.apache.sis.util.Debug;
- import static
org.apache.sis.internal.processing.image.IsolineTracer.UPPER_LEFT;
- import static
org.apache.sis.internal.processing.image.IsolineTracer.UPPER_RIGHT;
- import static
org.apache.sis.internal.processing.image.IsolineTracer.LOWER_RIGHT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.UPPER_LEFT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.UPPER_RIGHT;
+ import static org.apache.sis.internal.processing.isoline.Tracer.LOWER_RIGHT;
/**
