Make ClampType global

Author: tpietzsch

src/main/java/net/imglib2/algorithm/blocks/convert/ClampType.java renamed to src/main/java/net/imglib2/algorithm/blocks/ClampType.java

@@ -11,13 +11,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,10 +31,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imglib2.algorithm.blocks.convert;
+package net.imglib2.algorithm.blocks;
 
 /**
- * How to clamp values when converting between {@link net.imglib2.algorithm.blocks.util.OperandType}.
+ * How to clamp values when converting to target type.
  */
 public enum ClampType
 {
@@ -48,8 +48,13 @@ public enum ClampType
 	 */
 	CLAMP,
 
+	/**
+	 * clamp only to lower bound
+	 */
+	CLAMP_MIN,
+
 	/**
 	 * clamp only to upper bound
 	 */
-	CLAMP_MAX;
+	CLAMP_MAX
 }

src/main/java/net/imglib2/algorithm/blocks/UnaryBlockOperator.java

@@ -33,7 +33,6 @@
  */
 package net.imglib2.algorithm.blocks;
 
-import net.imglib2.algorithm.blocks.convert.ClampType;
 import net.imglib2.algorithm.blocks.convert.Convert;
 import net.imglib2.type.NativeType;
 import net.imglib2.util.Cast;

src/main/java/net/imglib2/algorithm/blocks/convert/Convert.java

@@ -37,6 +37,7 @@
 import java.util.function.Supplier;
 
 import net.imglib2.algorithm.blocks.BlockSupplier;
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.algorithm.blocks.DefaultUnaryBlockOperator;
 import net.imglib2.algorithm.blocks.UnaryBlockOperator;
 import net.imglib2.converter.Converter;

src/main/java/net/imglib2/algorithm/blocks/convert/ConvertBlockProcessor.java

@@ -39,6 +39,7 @@
 
 import net.imglib2.Interval;
 import net.imglib2.algorithm.blocks.BlockProcessor;
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.algorithm.blocks.util.BlockProcessorSourceInterval;
 import net.imglib2.algorithm.blocks.util.UnaryOperatorType;
 import net.imglib2.blocks.TempArray;

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

@@ -33,6 +33,7 @@
  */
 package net.imglib2.algorithm.blocks.convert;
 
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.algorithm.blocks.util.UnaryOperatorType;
 import net.imglib2.util.Cast;
 

src/main/java/net/imglib2/algorithm/blocks/downsample/Downsample.java

@@ -11,13 +11,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,7 +34,7 @@
 package net.imglib2.algorithm.blocks.downsample;
 
 import java.util.Arrays;
-import net.imglib2.algorithm.blocks.convert.ClampType;
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.CenterDouble;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.CenterFloat;
 import net.imglib2.algorithm.blocks.downsample.DownsampleBlockProcessors.HalfPixelDouble;

src/main/java/net/imglib2/algorithm/blocks/transform/Transform.java

@@ -35,7 +35,7 @@
 
 import net.imglib2.algorithm.blocks.DefaultUnaryBlockOperator;
 import net.imglib2.algorithm.blocks.UnaryBlockOperator;
-import net.imglib2.algorithm.blocks.convert.ClampType;
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.realtransform.AffineGet;
 import net.imglib2.realtransform.AffineTransform2D;
 import net.imglib2.realtransform.AffineTransform3D;

templates/main/java/net/imglib2/algorithm/blocks/ConvertLoops.vm

@@ -33,6 +33,7 @@
  */
 package net.imglib2.algorithm.blocks.convert;
 
+import net.imglib2.algorithm.blocks.ClampType;
 import net.imglib2.algorithm.blocks.util.UnaryOperatorType;
 import net.imglib2.util.Cast;