Skip to content

Commit fc6751d

Browse files
tpietzschtpietzsch
committed
ConvertScalars: make public, move to blocks.util package, add _clamp_min variants
1 parent 4c39f1e commit fc6751d

File tree

6 files changed

+391
-335
lines changed

6 files changed

+391
-335
lines changed

‎src/main/java/net/imglib2/algorithm/blocks/convert/ConvertLoops.java

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* %%
1212
* Redistribution and use in source and binary forms, with or without
1313
* modification, are permitted provided that the following conditions are met:
14-
*
14+
*
1515
* 1. Redistributions of source code must retain the above copyright notice,
1616
* this list of conditions and the following disclaimer.
1717
* 2. Redistributions in binary form must reproduce the above copyright notice,
1818
* this list of conditions and the following disclaimer in the documentation
1919
* and/or other materials provided with the distribution.
20-
*
20+
*
2121
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2222
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
2323
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,42 +36,42 @@
3636
import net.imglib2.algorithm.blocks.util.UnaryOperatorType;
3737
import net.imglib2.util.Cast;
3838

39-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_i8;
40-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i8;
41-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i8_clamp;
42-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i8_clamp_max;
43-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_u8;
44-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u8;
45-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u8_clamp;
46-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u8_clamp_max;
47-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_i16;
48-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i16;
49-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i16_clamp;
50-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i16_clamp_max;
51-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_u16;
52-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u16;
53-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u16_clamp;
54-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u16_clamp_max;
55-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_i32;
56-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i32;
57-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i32_clamp;
58-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i32_clamp_max;
59-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_u32;
60-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u32;
61-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u32_clamp;
62-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_u32_clamp_max;
63-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_i64;
64-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i64;
65-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i64_clamp;
66-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_i64_clamp_max;
67-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_f32;
68-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f32;
69-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f32_clamp;
70-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f32_clamp_max;
71-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.from_f64;
72-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f64;
73-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f64_clamp;
74-
import static net.imglib2.algorithm.blocks.convert.ConvertScalars.to_f64_clamp_max;
39+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_i8;
40+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i8;
41+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i8_clamp;
42+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i8_clamp_max;
43+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_u8;
44+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u8;
45+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u8_clamp;
46+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u8_clamp_max;
47+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_i16;
48+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i16;
49+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i16_clamp;
50+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i16_clamp_max;
51+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_u16;
52+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u16;
53+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u16_clamp;
54+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u16_clamp_max;
55+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_i32;
56+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i32;
57+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i32_clamp;
58+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i32_clamp_max;
59+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_u32;
60+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u32;
61+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u32_clamp;
62+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_u32_clamp_max;
63+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_i64;
64+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i64;
65+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i64_clamp;
66+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_i64_clamp_max;
67+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_f32;
68+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f32;
69+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f32_clamp;
70+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f32_clamp_max;
71+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.from_f64;
72+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f64;
73+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f64_clamp;
74+
import static net.imglib2.algorithm.blocks.util.ConvertScalars.to_f64_clamp_max;
7575

7676
/*
7777
* This is autogenerated source code -- DO NOT EDIT. Instead, edit the

0 commit comments

Comments
 (0)