This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 630a996a08331f15776ce987639be16bcc6fa4ae Merge: 9160018564 8c6d8cca43 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Fri Dec 27 12:54:06 2024 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. Contains only class or package renaming. .../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(-)