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 2020/06/23 17:57:43 UTC

[sis] 05/07: Make lower/upper cases consistent in map keys given to `stretchColorRamp(…)`.

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 a91054888a291eaa74937abf8ff9f093e453d1c1
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Jun 23 19:21:41 2020 +0200

    Make lower/upper cases consistent in map keys given to `stretchColorRamp(…)`.
---
 .../src/main/java/org/apache/sis/gui/coverage/RenderingData.java      | 2 +-
 .../src/main/java/org/apache/sis/internal/gui/ImageConverter.java     | 2 +-
 .../src/main/java/org/apache/sis/image/ImageProcessor.java            | 2 +-
 .../src/main/java/org/apache/sis/image/RecoloredImage.java            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/RenderingData.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/RenderingData.java
index a423f6a..84f9e12 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/RenderingData.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/RenderingData.java
@@ -285,7 +285,7 @@ final class RenderingData implements Cloneable {
             }
             modifiers.put("statistics", statistics);
             if (selectedDerivative == Stretching.AUTOMATIC) {
-                modifiers.put("MultStdDev", 3);
+                modifiers.put("multStdDev", 3);
             }
             return processor.stretchColorRamp(resampledImage, modifiers);
         }
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
index 69fe555..091910e 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/ImageConverter.java
@@ -111,7 +111,7 @@ final class ImageConverter extends Task<Statistics[]> {
 
         final ImageProcessor processor  = new ImageProcessor();
         final Statistics[]   statistics = processor.getStatistics(source, bounds);
-        final RenderedImage  image      = processor.stretchColorRamp(source, JDK9.mapOf("MultStdDev", 3, "statistics", statistics));
+        final RenderedImage  image      = processor.stretchColorRamp(source, JDK9.mapOf("multStdDev", 3, "statistics", statistics));
         final BufferedImage  buffer     = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB_PRE);
         final Graphics2D     graphics   = buffer.createGraphics();
         try {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java b/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
index 1d374b9..edf940f 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ImageProcessor.java
@@ -530,7 +530,7 @@ public class ImageProcessor implements Cloneable {
      *     <th>Purpose</th>
      *     <th>Values</th>
      *   </tr><tr>
-     *     <td>{@code "MultStdDev"}</td>
+     *     <td>{@code "multStdDev"}</td>
      *     <td>Multiple of the standard deviation.</td>
      *     <td>{@link Number} (typical values: 1.5, 2 or 3)</td>
      *   </tr><tr>
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java b/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
index fbc9993..28a8205 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/RecoloredImage.java
@@ -117,10 +117,10 @@ final class RecoloredImage extends ImageAdapter {
         Statistics    statistics    = null;
         double        deviations    = Double.POSITIVE_INFINITY;
         if (modifiers != null) {
-            Object value = modifiers.get("MultStdDev");
+            Object value = modifiers.get("multStdDev");
             if (value instanceof Number) {
                 deviations = ((Number) value).doubleValue();
-                ArgumentChecks.ensureStrictlyPositive("MultStdDev", deviations);
+                ArgumentChecks.ensureStrictlyPositive("multStdDev", deviations);
             }
             value = modifiers.get("statistics");
             if (value instanceof RenderedImage) {