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 14487a49abbeeb1cf8b895c3d8fe01cddb16f8eb
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Mar 27 16:47:03 2023 +0200
Rename the internal `Colorizer` class as `ColorModelBuilder` for avoiding
confusion with the new `Colorizer` interface.
---
.../apache/sis/gui/coverage/CoverageStyling.java | 4 ++--
.../org/apache/sis/coverage/grid/GridCoverage.java | 6 +++---
.../sis/coverage/grid/GridCoverageBuilder.java | 6 +++---
.../apache/sis/coverage/grid/ImageRenderer.java | 10 ++++-----
.../main/java/org/apache/sis/image/Colorizer.java | 3 ++-
.../java/org/apache/sis/image/Visualization.java | 24 +++++++++++-----------
.../j2d/{Colorizer.java => ColorModelBuilder.java} | 24 +++++++++++-----------
.../sis/internal/coverage/j2d/ColorModelType.java | 2 +-
.../sis/internal/coverage/j2d/ColorsForRange.java | 4 ++--
...lorizerTest.java => ColorModelBuilderTest.java} | 14 ++++++-------
.../apache/sis/test/suite/FeatureTestSuite.java | 2 +-
.../sis/internal/map/coverage/RenderingData.java | 6 +++---
12 files changed, 53 insertions(+), 52 deletions(-)
diff --git
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
index 44b98a4c87..8f2a2d51a7 100644
---
a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
+++
b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageStyling.java
@@ -31,7 +31,7 @@ import javafx.collections.ObservableList;
import javafx.beans.value.ObservableValue;
import javafx.scene.control.ContextMenu;
import org.apache.sis.coverage.Category;
-import org.apache.sis.internal.coverage.j2d.Colorizer;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.internal.gui.Resources;
import org.apache.sis.internal.gui.ImmutableObjectProperty;
import org.apache.sis.internal.gui.control.ColorRamp;
@@ -81,7 +81,7 @@ final class CoverageStyling extends
ColorColumnHandler<Category> implements Func
return;
}
}
- fallback = Colorizer.GRAYSCALE;
+ fallback = ColorModelBuilder.GRAYSCALE;
}
/**
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
index 35263aee2a..d1f6a544a8 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java
@@ -37,7 +37,7 @@ import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.image.DataType;
import org.apache.sis.image.ImageProcessor;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
-import org.apache.sis.internal.coverage.j2d.Colorizer;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.util.collection.DefaultTreeTable;
import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.TreeTable;
@@ -300,14 +300,14 @@ public abstract class GridCoverage extends BandedCoverage
{
final MathTransform1D[] converters, final ImageProcessor processor)
{
final int visibleBand = Math.max(0,
ImageUtilities.getVisibleBand(source));
- final Colorizer colorizer = new Colorizer(Colorizer.GRAYSCALE);
+ final ColorModelBuilder colorizer = new
ColorModelBuilder(ColorModelBuilder.GRAYSCALE);
final ColorModel colors;
if (colorizer.initialize(source.getSampleModel(),
sampleDimensions[visibleBand]) ||
colorizer.initialize(source.getColorModel()))
{
colors = colorizer.createColorModel(bandType.toDataBufferType(),
sampleDimensions.length, visibleBand);
} else {
- colors = Colorizer.NULL_COLOR_MODEL;
+ colors = ColorModelBuilder.NULL_COLOR_MODEL;
}
return processor.convert(source, getRanges(), converters, bandType,
colors);
}
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
index eddd5be859..c437c4ea81 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverageBuilder.java
@@ -34,7 +34,7 @@ import java.awt.image.WritableRaster;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.coverage.SampleDimension;
-import org.apache.sis.internal.coverage.j2d.Colorizer;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
import org.apache.sis.internal.coverage.j2d.TiledImage;
import org.apache.sis.internal.coverage.j2d.WritableTiledImage;
@@ -471,12 +471,12 @@ public class GridCoverageBuilder {
*/
bands = GridCoverage2D.defaultIfAbsent(bands, null,
raster.getNumBands());
final SampleModel sm = raster.getSampleModel();
- final Colorizer colorizer = new Colorizer(Colorizer.GRAYSCALE);
+ final ColorModelBuilder colorizer = new
ColorModelBuilder(ColorModelBuilder.GRAYSCALE);
final ColorModel colors;
if (colorizer.initialize(sm, bands.get(visibleBand)) ||
colorizer.initialize(sm, visibleBand)) {
colors =
colorizer.createColorModel(ImageUtilities.getBandType(sm), bands.size(),
visibleBand);
} else {
- colors = Colorizer.NULL_COLOR_MODEL;
+ colors = ColorModelBuilder.NULL_COLOR_MODEL;
}
/*
* Create an image from the raster. We favor BufferedImage
instance when possible,
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
index 38165a6943..79eddf520c 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/ImageRenderer.java
@@ -40,7 +40,7 @@ import org.apache.sis.coverage.SubspaceNotSpecifiedException;
import org.apache.sis.coverage.MismatchedCoverageRangeException;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.Category;
-import org.apache.sis.internal.coverage.j2d.Colorizer;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.internal.coverage.j2d.DeferredProperty;
import org.apache.sis.internal.coverage.j2d.RasterFactory;
import org.apache.sis.internal.coverage.j2d.TiledImage;
@@ -266,7 +266,7 @@ public class ImageRenderer {
/**
* The colors to use for each category. Never {@code null}.
* The function may return {@code null}, which means transparent.
- * The default value is {@link Colorizer#GRAYSCALE}.
+ * The default value is {@link ColorModelBuilder#GRAYSCALE}.
*
* @see #setCategoryColors(Function)
*/
@@ -362,7 +362,7 @@ public class ImageRenderer {
this.pixelStride = toIntExact(pixelStride);
this.scanlineStride = toIntExact(scanlineStride);
this.offsetZ = offsetZ;
- this.colors = Colorizer.GRAYSCALE;
+ this.colors = ColorModelBuilder.GRAYSCALE;
}
/**
@@ -740,13 +740,13 @@ public class ImageRenderer {
@SuppressWarnings("UseOfObsoleteCollectionType")
public RenderedImage createImage() {
final Raster raster = createRaster();
- final Colorizer colorizer = new Colorizer(colors);
+ final ColorModelBuilder colorizer = new ColorModelBuilder(colors);
final ColorModel colors;
final SampleModel sm = raster.getSampleModel();
if (colorizer.initialize(sm, bands[visibleBand]) ||
colorizer.initialize(sm, visibleBand)) {
colors = colorizer.createColorModel(buffer.getDataType(),
bands.length, visibleBand);
} else {
- colors = Colorizer.NULL_COLOR_MODEL;
+ colors = ColorModelBuilder.NULL_COLOR_MODEL;
}
SliceGeometry supplier = null;
if (imageGeometry == null) {
diff --git a/core/sis-feature/src/main/java/org/apache/sis/image/Colorizer.java
b/core/sis-feature/src/main/java/org/apache/sis/image/Colorizer.java
index 50aecab8b0..7f454b6cf6 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Colorizer.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Colorizer.java
@@ -28,6 +28,7 @@ import java.awt.image.SampleModel;
import java.awt.image.IndexColorModel;
import org.apache.sis.coverage.Category;
import org.apache.sis.coverage.SampleDimension;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.internal.coverage.j2d.ColorModelFactory;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.util.ArgumentChecks;
@@ -210,7 +211,7 @@ public interface Colorizer extends
Function<Colorizer.Target, Optional<ColorMode
final List<SampleDimension> ranges =
target.getRanges().orElse(null);
if (visibleBand < ranges.size()) {
final SampleModel model = target.getSampleModel();
- final var c = new
org.apache.sis.internal.coverage.j2d.Colorizer(colors);
+ final var c = new ColorModelBuilder(colors);
c.initialize(model, ranges.get(visibleBand));
return
Optional.ofNullable(c.createColorModel(model.getDataType(),
model.getNumBands(), visibleBand));
}
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
b/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
index 4dd6e7f7dd..914b847f0d 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/Visualization.java
@@ -42,7 +42,7 @@ import
org.opengis.referencing.operation.NoninvertibleTransformException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.internal.coverage.SampleDimensions;
import org.apache.sis.internal.coverage.CompoundTransform;
-import org.apache.sis.internal.coverage.j2d.Colorizer;
+import org.apache.sis.internal.coverage.j2d.ColorModelBuilder;
import org.apache.sis.internal.coverage.j2d.ImageLayout;
import org.apache.sis.internal.coverage.j2d.ImageUtilities;
import org.apache.sis.internal.feature.Resources;
@@ -201,30 +201,30 @@ final class Visualization extends ResampledImage {
throw new
IllegalArgumentException(Resources.format(Resources.Keys.OperationRequiresSingleBand));
}
/*
- * Get a `Colorizer` which will compute the `ColorModel` of
destination image.
- * There is different ways to create colorizer, depending on which
arguments
- * were supplied by user. In precedence order:
+ * Get a `ColorModelBuilder` which will compute the `ColorModel`
of destination image.
+ * There is different ways to create colorizer, depending on which
arguments were supplied by user.
+ * In precedence order:
*
* - rangesAndColor :
Collection<Map.Entry<NumberRange<?>,Color[]>>
* - sourceBands : List<SampleDimension>
* - statistics
*/
boolean initialized;
- final Colorizer colorizer;
+ final ColorModelBuilder colorizer;
if (rangesAndColors != null) {
- colorizer = new Colorizer(rangesAndColors);
+ colorizer = new ColorModelBuilder(rangesAndColors);
initialized = true;
} else {
/*
* Ranges of sample values were not specified explicitly.
Instead, we will try to infer them
* in various ways: sample dimensions, scaled color model,
statistics in last resort.
*/
- colorizer = new Colorizer(categoryColors);
+ colorizer = new ColorModelBuilder(categoryColors);
initialized = (sourceBands != null) &&
colorizer.initialize(source.getSampleModel(), sourceBands.get(visibleBand));
if (initialized) {
/*
- * If we have been able to configure Colorizer using
SampleDimension, apply an adjustment based
- * on the ScaledColorModel if it exists. Use case: an
image is created with an IndexColorModel
+ * If we have been able to configure ColorModelBuilder
using SampleDimension, apply an adjustment
+ * based on the ScaledColorModel if it exists. Use case:
image is created with an IndexColorModel
* determined by the SampleModel, then user enhanced
contrast by a call to `stretchColorRamp(…)`
* above. We want to preserve that contrast enhancement.
*/
@@ -250,8 +250,8 @@ final class Visualization extends ResampledImage {
source = BandSelectImage.create(source, new int[] {visibleBand});
// Make single-banded.
if (!initialized) {
/*
- * If none of above Colorizer configurations worked, use
statistics in last resort. We do that
- * after we reduced the image to a single band, in order to
reduce the amount of calculations.
+ * If none of above `ColorModelBuilder` configurations worked,
use statistics in last resort.
+ * We do that after we reduced the image to a single band in
order to reduce the amount of calculations.
*/
final DoubleUnaryOperator[] sampleFilters =
SampleDimensions.toSampleFilters(processor, sourceBands);
final Statistics statistics =
processor.valueOfStatistics(source, null, sampleFilters)[VISIBLE_BAND];
@@ -286,7 +286,7 @@ final class Visualization extends ResampledImage {
/*
* Final image creation after the tile layout has been chosen.
*/
- sampleModel =
layout.createBandedSampleModel(Colorizer.TYPE_COMPACT, NUM_BANDS, source,
bounds);
+ sampleModel =
layout.createBandedSampleModel(ColorModelBuilder.TYPE_COMPACT, NUM_BANDS,
source, bounds);
if (bounds == null) {
bounds = ImageUtilities.getBounds(source);
}
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilder.java
similarity index 97%
rename from
core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
rename to
core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilder.java
index 18cfa60ad9..055c491d22 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/Colorizer.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilder.java
@@ -49,10 +49,10 @@ import org.apache.sis.util.resources.Vocabulary;
* Usage:
*
* <ol>
- * <li>Create a new {@link Colorizer} instance.</li>
+ * <li>Create a new {@link ColorModelBuilder} instance.</li>
* <li>Invoke one of {@code initialize(…)} methods.</li>
* <li>Invoke {@link #createColorModel(int, int, int)}.</li>
- * <li>Discards {@code Colorizer}; each instance should be used only
once.</li>
+ * <li>Discards {@code ColorModelBuilder}; each instance should be used only
once.</li>
* </ol>
*
* There is no {@code initialize(Raster)} or {@code initialize(RenderedImage)}
method because if those methods
@@ -62,14 +62,14 @@ import org.apache.sis.util.resources.Vocabulary;
* for the same product at different times or at different depths.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.2
+ * @version 1.4
*
* @see ColorModelType
* @see ColorModelFactory#createColorModel(int, int, int, Collection)
*
* @since 1.1
*/
-public final class Colorizer {
+public final class ColorModelBuilder {
/**
* A color model constant set to {@code null}, used for identifying code
that explicitly set the
* color model to {@code null}. It may happen when no {@code
initialize(…)} method can be applied.
@@ -105,7 +105,7 @@ public final class Colorizer {
/**
* Applies a gray scale to quantitative category and transparent colors to
qualitative categories.
- * This is a possible argument for the {@link #Colorizer(Function)}
constructor.
+ * This is a possible argument for the {@link
#ColorModelBuilder(Function)} constructor.
*/
public static final Function<Category,Color[]> GRAYSCALE =
(category) -> category.isQuantitative() ? new Color[]
{Color.BLACK, Color.WHITE} : null;
@@ -148,13 +148,13 @@ public final class Colorizer {
/**
* Creates a new colorizer which will apply colors on the given range of
values in source image.
- * The {@code Colorizer} is considered initialized after this constructor;
+ * The {@code ColorModelBuilder} is considered initialized after this
constructor;
* callers shall <strong>not</strong> invoke an {@code initialize(…)}
method.
*
* @param colors the colors to use for each range of values in source
image.
* A {@code null} entry value means transparent.
*/
- public Colorizer(final Collection<Map.Entry<NumberRange<?>,Color[]>>
colors) {
+ public ColorModelBuilder(final
Collection<Map.Entry<NumberRange<?>,Color[]>> colors) {
ArgumentChecks.ensureNonNull("colors", colors);
entries = ColorsForRange.list(colors);
this.colors = GRAYSCALE;
@@ -167,7 +167,7 @@ public final class Colorizer {
* @param colors the colors to use for each category, or {@code null}
for default.
* The function may return {@code null}, which means
transparent.
*/
- public Colorizer(final Function<Category,Color[]> colors) {
+ public ColorModelBuilder(final Function<Category,Color[]> colors) {
this.colors = (colors != null) ? colors : GRAYSCALE;
}
@@ -258,8 +258,8 @@ public final class Colorizer {
/**
* Uses the given color model for mapping range of values to new colors.
The colors in the given color model
- * are ignored (because they will be replaced by colors specified by this
{@code Colorizer}); only the range
- * of values will be fetched, if such range exists.
+ * are ignored (because they will be replaced by colors specified by this
{@code ColorModelBuilder});
+ * only the range of values will be fetched, if such range exists.
*
* @param source the color model from which to get a range of values, or
{@code null}.
* @return {@code true} on success, or {@code false} if no range of values
has been found.
@@ -384,7 +384,7 @@ public final class Colorizer {
ColorsForRange[] entries = this.entries;
reuse: if (source != null) {
target = source.forConvertedValues(false);
- if
(target.getSampleRange().filter(Colorizer::isAlreadyScaled).isPresent()) {
+ if
(target.getSampleRange().filter(ColorModelBuilder::isAlreadyScaled).isPresent())
{
/*
* If we enter in this block, all sample values are already in
the [0 … 255] range.
* If in addition there is no conversion to apply, then there
is nothing to do.
@@ -584,7 +584,7 @@ reuse: if (source != null) {
*/
public MathTransform1D getSampleToIndexValues() throws
NoninvertibleTransformException {
checkInitializationStatus(true);
- return (target != null) ?
target.getTransferFunction().orElseGet(Colorizer::identity).inverse() :
identity();
+ return (target != null) ?
target.getTransferFunction().orElseGet(ColorModelBuilder::identity).inverse() :
identity();
}
/**
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
index c161b0b300..7064835bd3 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelType.java
@@ -67,7 +67,7 @@ public enum ColorModelType {
/**
* Whether rendering with this color model is slow.
- * In such case, the color model may need to be changed using {@link
Colorizer}.
+ * In such case, the color model may need to be changed using {@link
ColorModelBuilder}.
*/
public final boolean isSlow;
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
index a284b51ec9..d8012bd6e8 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorsForRange.java
@@ -48,8 +48,8 @@ final class ColorsForRange implements
Comparable<ColorsForRange> {
/**
* The range of sample values on which the colors will be applied. Shall
never be null.
- * May be updated after {@link Colorizer#compact()} mapped range of
floating point values
- * to range of {@link IndexColorModel} values.
+ * May be updated after {@link ColorModelBuilder#compact()} mapped range
of floating
+ * point values to range of {@link IndexColorModel} values.
*/
NumberRange<?> sampleRange;
diff --git
a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilderTest.java
similarity index 93%
rename from
core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
rename to
core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilderTest.java
index ee519dcdb6..66bb12b931 100644
---
a/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorizerTest.java
+++
b/core/sis-feature/src/test/java/org/apache/sis/internal/coverage/j2d/ColorModelBuilderTest.java
@@ -35,21 +35,21 @@ import static org.junit.Assert.*;
/**
- * Tests {@link Colorizer}.
+ * Tests {@link ColorModelBuilder}.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.2
+ * @version 1.4
* @since 1.1
*/
-public final class ColorizerTest extends TestCase {
+public final class ColorModelBuilderTest extends TestCase {
/**
- * Tests the creation of an index color model using {@link
Colorizer#Colorizer(Collection)}.
+ * Tests the creation of an index color model using {@link
ColorModelBuilder#ColorModelBuilder(Collection)}.
*
* @throws TransformException if a sample value cannot be converted.
*/
@Test
public void testRangeAndColors() throws TransformException {
- final Colorizer colorizer = new Colorizer(List.of(
+ final ColorModelBuilder colorizer = new ColorModelBuilder(List.of(
new SimpleEntry<>(NumberRange.create(0, true, 0, true), new
Color[] {Color.GRAY}),
new SimpleEntry<>(NumberRange.create(1, true, 1, true), new
Color[] {ColorModelFactory.TRANSPARENT}),
new SimpleEntry<>(NumberRange.create(2, true, 15, true), new
Color[] {Color.BLUE, Color.WHITE, Color.RED})));
@@ -85,7 +85,7 @@ public final class ColorizerTest extends TestCase {
}
/**
- * Tests the creation of an index color model using {@link
Colorizer#Colorizer(Function)}
+ * Tests the creation of an index color model using {@link
ColorModelBuilder#ColorModelBuilder(Function)}
* and an initialization with a {@link SampleDimension}.
*
* @throws TransformException if a sample value cannot be converted.
@@ -99,7 +99,7 @@ public final class ColorizerTest extends TestCase {
.addQualitative ("Error", MathFunctions.toNanFloat(3))
.setName("Temperature").build();
- final Colorizer colorizer = new Colorizer(Colorizer.GRAYSCALE);
+ final ColorModelBuilder colorizer = new
ColorModelBuilder(ColorModelBuilder.GRAYSCALE);
assertTrue("initialize", colorizer.initialize(null, sd));
final IndexColorModel cm = (IndexColorModel)
colorizer.compactColorModel(1, 0); // Must be first.
/*
diff --git
a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index 571725f8ee..3d09e913e5 100644
---
a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++
b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -87,7 +87,7 @@ import org.junit.runners.Suite;
org.apache.sis.internal.coverage.j2d.ImageUtilitiesTest.class,
org.apache.sis.internal.coverage.j2d.ImageLayoutTest.class,
org.apache.sis.internal.coverage.j2d.ScaledColorSpaceTest.class,
- org.apache.sis.internal.coverage.j2d.ColorizerTest.class,
+ org.apache.sis.internal.coverage.j2d.ColorModelBuilderTest.class,
org.apache.sis.internal.coverage.j2d.SampleModelFactoryTest.class,
org.apache.sis.internal.processing.isoline.IsolinesTest.class,
org.apache.sis.image.DataTypeTest.class,
diff --git
a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/RenderingData.java
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/RenderingData.java
index b02ccdb4c8..2ba1782b1f 100644
---
a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/RenderingData.java
+++
b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/coverage/RenderingData.java
@@ -654,9 +654,9 @@ public class RenderingData implements Cloneable {
* Apply a map projection on the image, then convert the floating
point results to integer values
* that we can use with IndexColorModel.
*
- * TODO: if `colors` is null, instead of defaulting to
`Colorizer.GRAYSCALE` we should get the colors
- * from the current ColorModel. This work should be done in
Colorizer by converting the ranges of
- * sample values in source image to ranges of sample values in
destination image, then query
+ * TODO: if `colors` is null, instead of defaulting to
`ColorModelBuilder.GRAYSCALE` we should get the colors
+ * from the current ColorModel. This work should be done in
`ColorModelBuilder` by converting the ranges
+ * of sample values in source image to ranges of sample values
in destination image, then query
* ColorModel.getRGB(Object) for increasing integer values in
that range.
*/
if (CREATE_INDEX_COLOR_MODEL) {
