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 2025/01/24 16:25:52 UTC
(sis) 02/03: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 4bd7092a20528c1dea8a6094e3bee9ef8c001f69
Merge: 84a6d62055 630a996a08
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Dec 27 12:58:17 2024 +0100
Merge branch 'geoapi-3.1'
.../org.apache.sis.feature/main/module-info.java | 5 +++
.../apache/sis/coverage/grid/DefaultEvaluator.java | 2 +-
.../apache/sis/coverage/grid/GridCoverage2D.java | 4 +--
.../sis/coverage/grid/GridCoverageBuilder.java | 8 ++---
.../apache/sis/coverage/grid/ImageRenderer.java | 12 +++----
.../apache/sis/coverage/grid/SliceGeometry.java | 2 +-
.../apache/sis/coverage/privy/RangeArgument.java | 6 ++--
.../main/org/apache/sis/image/AnnotatedImage.java | 4 +--
.../org/apache/sis/image/BandAggregateImage.java | 2 +-
.../org/apache/sis/image/BandAggregateLayout.java | 4 +--
.../main/org/apache/sis/image/BandSelectImage.java | 8 ++---
.../main/org/apache/sis/image/BandSharing.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 8 ++---
.../main/org/apache/sis/image/Colorizer.java | 8 ++---
.../main/org/apache/sis/image/ComputedImage.java | 2 +-
.../main/org/apache/sis/image/DataType.java | 2 +-
.../main/org/apache/sis/image/ImageCombiner.java | 4 +--
.../main/org/apache/sis/image/ImageLayout.java | 2 +-
.../main/org/apache/sis/image/ImageOverlay.java | 2 +-
.../main/org/apache/sis/image/ImageProcessor.java | 4 +--
.../main/org/apache/sis/image/MaskImage.java | 6 ++--
.../main/org/apache/sis/image/MaskedImage.java | 6 ++--
.../org/apache/sis/image/MultiSourceImage.java | 2 +-
.../org/apache/sis/image/MultiSourcePrefetch.java | 2 +-
.../main/org/apache/sis/image/PixelIterator.java | 2 +-
.../main/org/apache/sis/image/PlanarImage.java | 8 ++---
.../sis/image/PositionalConsistencyImage.java | 2 +-
.../main/org/apache/sis/image/PrefetchedImage.java | 8 ++---
.../main/org/apache/sis/image/RecoloredImage.java | 4 +--
.../main/org/apache/sis/image/ResampledImage.java | 6 ++--
.../org/apache/sis/image/SourceAlignedImage.java | 2 +-
.../org/apache/sis/image/StatisticsCalculator.java | 2 +-
.../main/org/apache/sis/image/Transferer.java | 2 +-
.../main/org/apache/sis/image/Visualization.java | 4 +--
.../apache/sis/image/WritableComputedImage.java | 2 +-
.../privy/BatchComputedImage.java | 2 +-
.../privy/ColorModelBuilder.java | 2 +-
.../privy/ColorModelFactory.java | 2 +-
.../{coverage => image}/privy/ColorModelType.java | 2 +-
.../privy/ColorScaleBuilder.java | 2 +-
.../{coverage => image}/privy/ColorsForRange.java | 2 +-
.../privy/DeferredProperty.java | 2 +-
.../sis/{coverage => image}/privy/FillValues.java | 2 +-
.../{coverage => image}/privy/ImageUtilities.java | 2 +-
.../privy/MultiBandsIndexColorModel.java | 2 +-
.../{coverage => image}/privy/ObservableImage.java | 2 +-
.../{coverage => image}/privy/RasterFactory.java | 2 +-
.../privy/SampleModelBuilder.java} | 20 +++++------
.../privy/ScaledColorModel.java | 2 +-
.../privy/ScaledColorSpace.java | 2 +-
.../privy/TileErrorHandler.java | 2 +-
.../{coverage => image}/privy/TileOpExecutor.java | 2 +-
.../{coverage => image}/privy/TilePlaceholder.java | 2 +-
.../sis/{coverage => image}/privy/TiledImage.java | 2 +-
.../privy/WritableTiledImage.java | 2 +-
.../org/apache/sis/image/privy/package-info.java | 30 ++++++++++++++++
.../sis/coverage/grid/GridCoverage2DTest.java | 2 +-
.../coverage/grid/ResampledGridCoverageTest.java | 2 +-
.../coverage/grid/TranslatedGridCoverageTest.java | 2 +-
.../apache/sis/image/BandAggregateImageTest.java | 4 +--
.../org/apache/sis/image/BandSelectImageTest.java | 4 +--
.../org/apache/sis/image/ImageOverlayTest.java | 2 +-
.../org/apache/sis/image/InterpolationTest.java | 2 +-
.../test/org/apache/sis/image/MaskedImageTest.java | 2 +-
.../test/org/apache/sis/image/PlanarImageTest.java | 2 +-
.../org/apache/sis/image/ResampledImageTest.java | 2 +-
.../apache/sis/image/StatisticsCalculatorTest.java | 2 +-
.../test/org/apache/sis/image/TiledImageMock.java | 4 +--
.../privy/ColorModelBuilderTest.java | 2 +-
.../privy/ImageUtilitiesTest.java | 2 +-
.../privy/SampleModelBuilderTest.java} | 42 +++++++++++-----------
.../privy/ScaledColorSpaceTest.java | 2 +-
.../sis/image/processing/isoline/IsolinesTest.java | 2 +-
.../org/apache/sis/map/coverage/RenderingData.java | 4 +--
.../sis/map/coverage/RenderingWorkaround.java | 2 +-
.../sis/storage/geotiff/CompressedSubset.java | 2 +-
.../org/apache/sis/storage/geotiff/DataSubset.java | 6 ++--
.../sis/storage/geotiff/ImageFileDirectory.java | 8 ++---
.../org/apache/sis/storage/geotiff/Writer.java | 2 +-
.../storage/geotiff/writer/ReformattedImage.java | 6 ++--
.../org/apache/sis/storage/geotiff/WriterTest.java | 2 +-
.../apache/sis/storage/netcdf/base/Convention.java | 2 +-
.../sis/storage/netcdf/base/RasterResource.java | 2 +-
.../sis/storage/sql/postgis/RasterReader.java | 6 ++--
.../aggregate/ConcatenatedGridCoverage.java | 2 +-
.../sis/storage/base/TiledDeferredImage.java | 2 +-
.../apache/sis/storage/base/TiledGridCoverage.java | 4 +--
.../apache/sis/storage/base/TiledGridResource.java | 4 +--
.../apache/sis/storage/esri/AsciiGridStore.java | 6 ++--
.../org/apache/sis/storage/esri/RasterStore.java | 8 ++---
.../apache/sis/storage/esri/RawRasterReader.java | 4 +--
.../sis/storage/image/WorldFileResource.java | 2 +-
.../main/org/apache/sis/util/resources/Errors.java | 7 +---
.../apache/sis/util/resources/Errors.properties | 1 -
.../apache/sis/util/resources/Errors_fr.properties | 1 -
.../apache/sis/gui/coverage/CoverageCanvas.java | 2 +-
.../main/org/apache/sis/gui/coverage/GridView.java | 2 +-
.../apache/sis/gui/coverage/IsolineRenderer.java | 2 +-
.../apache/sis/gui/internal/ImageConverter.java | 4 +--
.../main/org/apache/sis/gui/map/MapCanvasAWT.java | 2 +-
.../main/org/apache/sis/storage/gdal/Band.java | 2 +-
.../org/apache/sis/storage/gdal/TiledResource.java | 4 +--
102 files changed, 224 insertions(+), 194 deletions(-)
diff --cc endorsed/src/org.apache.sis.feature/main/module-info.java
index d6907a8a0b,88846fbe09..1b5b4cf258
--- a/endorsed/src/org.apache.sis.feature/main/module-info.java
+++ b/endorsed/src/org.apache.sis.feature/main/module-info.java
@@@ -72,7 -71,16 +72,12 @@@ module org.apache.sis.feature
exports org.apache.sis.geometry.wrapper.j2d to
org.apache.sis.gui; // In the "optional" sub-project.
- exports org.apache.sis.geometry.wrapper.jts to
- org.apache.sis.portrayal.map, // In the "incubator" sub-project.
- org.apache.sis.cql; // In the "incubator" sub-project.
-
exports org.apache.sis.coverage.privy to
+ org.apache.sis.storage,
+ org.apache.sis.storage.netcdf,
+ org.apache.sis.portrayal;
+
+ exports org.apache.sis.image.privy to
org.apache.sis.storage,
org.apache.sis.storage.sql,
org.apache.sis.storage.netcdf,
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
index f9c8ba8df5,cb5bd3c4cd..496f47c258
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
@@@ -46,9 -46,12 +46,9 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.privy.Numerics;
import org.apache.sis.feature.internal.Resources;
- import org.apache.sis.coverage.privy.ImageUtilities;
+ import org.apache.sis.image.privy.ImageUtilities;
import static org.apache.sis.pending.jdk.JDK18.ceilDiv;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.grid.SequenceType;
-
/**
* An iterator over sample values in a raster or an image. This iterator makes easier to read and write efficiently
diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
index ae0591a7bf,46d2ccac74..53c7bcc145
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
@@@ -32,10 -32,10 +32,10 @@@ import org.apache.sis.storage.internal.
import org.apache.sis.util.privy.Numerics;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.logging.Logging;
- import static org.apache.sis.coverage.privy.ImageUtilities.LOGGER;
+ import static org.apache.sis.image.privy.ImageUtilities.LOGGER;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
+// Specific to the main branch:
+import org.apache.sis.coverage.CannotEvaluateException;
/**