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 c2b85ee4ee2605493bd2a8e82537ce0a245ca130 Merge: 64feb29631 64f25a5066 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Wed Feb 26 15:38:49 2025 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1. This merge contains work in preparation of the refactoring of the GeoHEIF reader. .../main/org/apache/sis/image/DataType.java | 5 +- .../main/org/apache/sis/image/MaskImage.java | 2 +- .../main/org/apache/sis/image/RecoloredImage.java | 3 +- .../apache/sis/image/privy/ColorModelBuilder.java | 309 ++++++++++++++------ .../apache/sis/image/privy/ColorModelFactory.java | 35 ++- .../org/apache/sis/image/privy/ImageUtilities.java | 8 +- .../apache/sis/image/privy/SampleModelBuilder.java | 35 ++- .../org/apache/sis/image/BandSelectImageTest.java | 2 +- .../apache/sis/image/privy/ImageUtilitiesTest.java | 16 +- .../sis/image/privy/SampleModelBuilderTest.java | 22 +- .../sis/metadata/iso/citation/Citations.java | 54 ++-- .../sis/metadata/privy/NameToIdentifier.java | 2 +- .../apache/sis/io/wkt/GeodeticObjectParser.java | 15 +- .../operation/DefaultConcatenatedOperation.java | 8 +- .../apache/sis/referencing/privy/WKTKeywords.java | 3 + .../sis/referencing/ImmutableIdentifierTest.java | 2 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 10 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 40 ++- .../sis/storage/geotiff/GeoTiffStoreProvider.java | 9 +- .../sis/storage/geotiff/ImageFileDirectory.java | 14 +- .../sis/storage/geotiff/MultiResolutionImage.java | 2 +- .../org/apache/sis/storage/geotiff/Reader.java | 12 +- .../org/apache/sis/storage/geotiff/Writer.java | 2 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 5 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 2 +- .../apache/sis/storage/netcdf/base/Convention.java | 8 - .../apache/sis/storage/netcdf/base/Decoder.java | 28 +- .../apache/sis/storage/netcdf/base/FeatureSet.java | 4 +- .../sis/storage/netcdf/base/GridMapping.java | 314 +++++++++++++-------- .../sis/storage/netcdf/base/NamedElement.java | 2 +- .../org/apache/sis/storage/netcdf/base/Node.java | 3 +- .../sis/storage/netcdf/base/RasterResource.java | 8 +- .../apache/sis/storage/netcdf/base/Variable.java | 36 +-- .../sis/storage/netcdf/classic/VariableInfo.java | 2 +- .../sis/storage/netcdf/internal/Resources.java | 20 +- .../storage/netcdf/internal/Resources.properties | 6 +- .../netcdf/internal/Resources_fr.properties | 6 +- .../sis/storage/netcdf/ucar/VariableWrapper.java | 11 +- .../apache/sis/storage/netcdf/base/GridTest.java | 15 +- .../apache/sis/storage/sql/feature/Analyzer.java | 8 +- .../sis/storage/sql/feature/QueryAnalyzer.java | 13 +- .../org/apache/sis/io/stream/ChannelDataInput.java | 174 ++++++------ .../org/apache/sis/io/stream/DataTransfer.java | 28 +- .../apache/sis/io/stream/HyperRectangleReader.java | 28 +- .../apache/sis/io/stream/MemoryDataTransfer.java | 22 +- .../main/org/apache/sis/io/stream/Region.java | 13 +- .../org/apache/sis/storage/AbstractResource.java | 10 +- .../org/apache/sis/storage/StorageConnector.java | 71 +++-- .../org/apache/sis/storage/aggregate/Group.java | 22 +- .../org/apache/sis/storage/base/ArrayOfLongs.java | 86 ++++++ .../apache/sis/storage/base/MetadataBuilder.java | 17 +- .../apache/sis/storage/base/TiledGridCoverage.java | 27 +- .../org/apache/sis/storage/esri/RasterStore.java | 2 +- .../apache/sis/storage/esri/RawRasterReader.java | 20 +- .../apache/sis/storage/esri/RawRasterStore.java | 16 +- .../apache/sis/storage/image/WritableStore.java | 4 +- .../sis/io/stream/HyperRectangleReaderTest.java | 10 +- .../apache/sis/storage/StorageConnectorTest.java | 16 ++ .../main/org/apache/sis/util/privy/Numerics.java | 19 ++ .../test/org/apache/sis/pending/jdk/JDK18Test.java | 53 ++++ .../org/apache/sis/util/privy/NumericsTest.java | 26 +- .../org/apache/sis/storage/gdal/TiledResource.java | 2 +- 62 files changed, 1170 insertions(+), 597 deletions(-)