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 9b361070f3aa02c7c887a6727b5ff376fcfb1d55 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri May 20 15:46:43 2022 +0200 Upgrade JavaFX dependencies. Minor documentation fixes. --- .../sis/internal/map/coverage/MultiResolutionCoverageLoader.java | 4 ++-- pom.xml | 2 +- .../src/main/java/org/apache/sis/internal/netcdf/Raster.java | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java index 53610b5b17..51ee06b053 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java @@ -41,8 +41,8 @@ import org.apache.sis.io.TableAppender; /** - * A helper class for reading {@link GridCoverage} instances at various resolution. - * The resolution are inferred from {@link GridCoverageResource#getResolutions()}, + * A helper class for reading {@link GridCoverage} instances at various resolutions. + * The resolutions are inferred from {@link GridCoverageResource#getResolutions()}, * using default values if necessary. The objective CRS does not need to be the same * than the coverage CRS, in which case transformations are applied at the point in * the center of the display bounds. diff --git a/pom.xml b/pom.xml index 728a92d38b..ba1594b471 100644 --- a/pom.xml +++ b/pom.xml @@ -557,7 +557,7 @@ <maven.compiler.target>8</maven.compiler.target> <sis.plugin.version>${project.version}</sis.plugin.version> <sis.non-free.version>1.2</sis.non-free.version> <!-- Used only if "non-free" profile is activated. --> - <javafx.version>17</javafx.version> <!-- Used only if "javafx" profile is activated. --> + <javafx.version>18.0.1</javafx.version> <!-- Used only if "javafx" profile is activated. --> <geoapi.version>4.0-SNAPSHOT</geoapi.version> </properties> diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java index dbda13d835..611452f19d 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Raster.java @@ -80,6 +80,15 @@ final class Raster extends BufferedGridCoverage { /** * Creates a new raster from the given resource. + * + * @param domain the grid extent, CRS and conversion from cell indices to CRS. + * @param range sample dimensions for each image band. + * @param data the sample values, potentially multi-banded. + * @param lebel name to display in error messages. Not to be used for processing. + * @param pixelStride increment to apply on index for moving to the next pixel in the same band. + * @param bandOffsets offsets to add to sample index in each band, or {@code null} if none. + * @param visibleBand the band to use for defining pixel colors when the image is displayed on screen. + * @param colors the colors to use for each category, or {@code null} for default. */ Raster(final GridGeometry domain, final List<SampleDimension> range, final DataBuffer data, final String label, final int pixelStride, final int[] bandOffsets, final int visibleBand,
