Skip to content

Commit 65c1343

Browse files
committed
Change order of types
1 parent f81de53 commit 65c1343

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

src/main/java/qupath/ext/imglib2/ImgBuilder.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@
4141
/**
4242
* A class to create {@link Img} or {@link RandomAccessibleInterval} from an {@link ImageServer}.
4343
* <p>
44-
* Use a {@link #createBuilder(ImageServer)} or {@link #createBuilder(ImageServer, NativeType)} to create an instance of this class.
44+
* Use {@link #createBuilder(ImageServer)}, {@link #createBuilder(ImageServer, NumericType)},
45+
* {@link #createRealBuilder(ImageServer)} or {@link #createRealBuilder(ImageServer, RealType)} to create an instance
46+
* of this class.
4547
* <p>
4648
* This class is thread-safe.
4749
*
4850
* @param <T> the type of the returned accessibles
4951
* @param <A> the type contained in the input image
5052
*/
51-
public class ImgBuilder<T extends NativeType<T> & NumericType<T>, A extends SizableDataAccess> {
53+
public class ImgBuilder<T extends NumericType<T> & NativeType<T>, A extends SizableDataAccess> {
5254

5355
/**
5456
* The index of the X axis of accessibles returned by functions of this class
@@ -96,7 +98,7 @@ private ImgBuilder(ImageServer<BufferedImage> server, T type, Function<BufferedI
9698
* Create a builder from an {@link ImageServer}. This doesn't create any accessibles yet.
9799
* <p>
98100
* The type of the output image is not checked, which might lead to problems later when accessing pixel values of the
99-
* returned accessibles of this class. It is recommended to use {@link #createBuilder(ImageServer, NativeType)} instead.
101+
* returned accessibles of this class. It is recommended to use {@link #createBuilder(ImageServer, NumericType)} instead.
100102
* See also this function to know which pixel type is used.
101103
*
102104
* @param server the input image
@@ -166,7 +168,7 @@ private ImgBuilder(ImageServer<BufferedImage> server, T type, Function<BufferedI
166168
* @throws IllegalArgumentException if the provided type is not compatible with the input image (see above), or if
167169
* the provided image has less than one channel
168170
*/
169-
public static <T extends NativeType<T> & NumericType<T>> ImgBuilder<T, ?> createBuilder(ImageServer<BufferedImage> server, T type) {
171+
public static <T extends NumericType<T> & NativeType<T>> ImgBuilder<T, ?> createBuilder(ImageServer<BufferedImage> server, T type) {
170172
checkType(server, type);
171173

172174
if (server.isRGB()) {
@@ -211,7 +213,7 @@ private ImgBuilder(ImageServer<BufferedImage> server, T type, Function<BufferedI
211213
* Create a builder from an {@link ImageServer}. This doesn't create any accessibles yet.
212214
* <p>
213215
* The type of the output image is not checked, which might lead to problems later when accessing pixel values of the
214-
* returned accessibles of this class. It is recommended to use {@link #createRealBuilder(ImageServer, NativeType)}
216+
* returned accessibles of this class. It is recommended to use {@link #createRealBuilder(ImageServer, RealType)}
215217
* instead. See also this function to know which pixel type is used.
216218
*
217219
* @param server the input image
@@ -235,7 +237,7 @@ private ImgBuilder(ImageServer<BufferedImage> server, T type, Function<BufferedI
235237
* If the input image is {@link ImageServer#isRGB() RGB}, the type must be {@link UnsignedByteType}. Images
236238
* created by the returned builder will have 3 channels (RGB).
237239
* </li>
238-
* <li>Else, see {@link #createBuilder(ImageServer, NativeType)}.</li>
240+
* <li>Else, see {@link #createBuilder(ImageServer, NumericType)}.</li>
239241
* </ul>
240242
*
241243
* @param server the input image
@@ -245,7 +247,7 @@ private ImgBuilder(ImageServer<BufferedImage> server, T type, Function<BufferedI
245247
* @throws IllegalArgumentException if the provided type is not compatible with the input image (see above), or if
246248
* the provided image has less than one channel
247249
*/
248-
public static <T extends NativeType<T> & RealType<T>> ImgBuilder<T, ?> createRealBuilder(ImageServer<BufferedImage> server, T type) {
250+
public static <T extends RealType<T> & NativeType<T>> ImgBuilder<T, ?> createRealBuilder(ImageServer<BufferedImage> server, T type) {
249251
checkRealType(server, type);
250252

251253
if (server.isRGB()) {

0 commit comments

Comments
 (0)