|
53 | 53 | public class ImgLib2ImageServer<T extends NativeType<T> & NumericType<T>> extends AbstractTileableImageServer { |
54 | 54 |
|
55 | 55 | private static final AtomicInteger counter = new AtomicInteger(); |
56 | | - private final List<RandomAccessibleInterval<T>> accessibles; |
| 56 | + private final List<? extends RandomAccessibleInterval<T>> accessibles; |
57 | 57 | private final ImageServerMetadata metadata; |
58 | 58 | private final int numberOfChannelsInAccessibles; |
59 | 59 |
|
60 | | - private ImgLib2ImageServer(List<RandomAccessibleInterval<T>> accessibles, PixelType pixelType, ImageServerMetadata metadata) { |
| 60 | + private ImgLib2ImageServer(List<? extends RandomAccessibleInterval<T>> accessibles, PixelType pixelType, ImageServerMetadata metadata) { |
61 | 61 | this.accessibles = accessibles; |
62 | 62 |
|
63 | 63 | RandomAccessibleInterval<T> firstAccessible = accessibles.getFirst(); |
@@ -97,7 +97,7 @@ private ImgLib2ImageServer(List<RandomAccessibleInterval<T>> accessibles, PixelT |
97 | 97 | * do not have the same number of channels, z-stacks, or timepoints, or if the accessible type is {@link ARGBType} |
98 | 98 | * and the number of channels of the accessibles is not 1 |
99 | 99 | */ |
100 | | - public static <T extends NativeType<T> & NumericType<T>> Builder<T> builder(List<RandomAccessibleInterval<T>> accessibles) { |
| 100 | + public static <T extends NativeType<T> & NumericType<T>> Builder<T> builder(List<? extends RandomAccessibleInterval<T>> accessibles) { |
101 | 101 | return new Builder<>(accessibles); |
102 | 102 | } |
103 | 103 |
|
@@ -182,11 +182,11 @@ protected BufferedImage createDefaultRGBImage(int width, int height) { |
182 | 182 | public static class Builder<T extends NativeType<T> & NumericType<T>> { |
183 | 183 |
|
184 | 184 | private static final int DEFAULT_TILE_SIZE = 1024; |
185 | | - private final List<RandomAccessibleInterval<T>> accessibles; |
| 185 | + private final List<? extends RandomAccessibleInterval<T>> accessibles; |
186 | 186 | private final PixelType pixelType; |
187 | 187 | private ImageServerMetadata metadata; |
188 | 188 |
|
189 | | - private Builder(List<RandomAccessibleInterval<T>> accessibles) { |
| 189 | + private Builder(List<? extends RandomAccessibleInterval<T>> accessibles) { |
190 | 190 | checkAccessibles(accessibles); |
191 | 191 |
|
192 | 192 | RandomAccessibleInterval<T> firstAccessible = accessibles.getFirst(); |
@@ -324,7 +324,7 @@ public ImgLib2ImageServer<T> build() { |
324 | 324 | return new ImgLib2ImageServer<>(accessibles, pixelType, metadata); |
325 | 325 | } |
326 | 326 |
|
327 | | - private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles(List<RandomAccessibleInterval<T>> accessibles) { |
| 327 | + private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles(List<? extends RandomAccessibleInterval<T>> accessibles) { |
328 | 328 | if (accessibles == null) { |
329 | 329 | throw new NullPointerException("The provided list of accessibles is null"); |
330 | 330 | } |
@@ -391,7 +391,7 @@ private static <T extends NativeType<T> & NumericType<T>> void checkAccessibles( |
391 | 391 | } |
392 | 392 |
|
393 | 393 | private static <T extends NativeType<T> & NumericType<T>> void checkChannels( |
394 | | - List<RandomAccessibleInterval<T>> accessibles, |
| 394 | + List<? extends RandomAccessibleInterval<T>> accessibles, |
395 | 395 | Collection<ImageChannel> channels |
396 | 396 | ) { |
397 | 397 | for (ImageChannel channel: channels) { |
|
0 commit comments