Skip to content

Trying to simplify #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petebankhead merged 12 commits into from
Dec 2, 2025
Merged

Trying to simplify #17

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6e812fb
Add Realtype builders
Rylern Nov 28, 2025
277ccc1
Remove alpha component
Rylern Nov 28, 2025
f81de53
Remove duplicate code
Rylern Nov 28, 2025
65c1343
Change order of types
Rylern Nov 28, 2025
48bb249
Attempting to simplify things
petebankhead Dec 1, 2025
9dd727b
Reduce code
petebankhead Dec 1, 2025
55810f5
Add tests, make method public
petebankhead Dec 1, 2025
a54d959
Quick fixes
petebankhead Dec 2, 2025
c44d702
Addressing more comments
petebankhead Dec 2, 2025
54bc71d
More cleanup, addressing issues
petebankhead Dec 2, 2025
1cc760b
Minor fixes
petebankhead Dec 2, 2025
d630f0d
Unsafety first
petebankhead Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/main/java/qupath/ext/imglib2/AccessibleScaler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.imglib2.realtransform.RealViews;
import net.imglib2.realtransform.Scale2D;
import net.imglib2.realtransform.Translation2D;
import net.imglib2.type.NativeType;
import net.imglib2.type.numeric.NumericType;
import net.imglib2.view.Views;

Expand Down Expand Up @@ -40,7 +39,7 @@ private AccessibleScaler() {
* @throws IllegalArgumentException if the input interval has at least one minimum different from 0, if the provided scale is less
* than or equal to 0, or if the input interval has less than two dimensions
*/
public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterval<T> scaleWithLinearInterpolation(
public static <T extends NumericType<T>> RandomAccessibleInterval<T> scaleWithLinearInterpolation(
RandomAccessibleInterval<T> input,
double scale
) {
Expand All @@ -59,7 +58,7 @@ public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterva
* @throws IllegalArgumentException if the input interval has at least one minimum different from 0, if the provided scale is less
* than or equal to 0, or if the input interval has less than two dimensions
*/
public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterval<T> scaleWithNearestNeighborInterpolation(
public static <T> RandomAccessibleInterval<T> scaleWithNearestNeighborInterpolation(
RandomAccessibleInterval<T> input,
double scale
) {
Expand All @@ -79,7 +78,7 @@ public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterva
* @throws IllegalArgumentException if the input interval has at least one minimum different from 0, if the provided scale is less
* than or equal to 0, or if the input interval has less than two dimensions
*/
public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterval<T> scale(
public static <T> RandomAccessibleInterval<T> scale(
RandomAccessibleInterval<T> input,
double scale,
InterpolatorFactory<T, RandomAccessible<T>> interpolatorFactory
Expand All @@ -104,7 +103,7 @@ public static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterva
}
}

private static <T extends NativeType<T> & NumericType<T>> RandomAccessibleInterval<T> scaleWithoutChecks(
private static <T> RandomAccessibleInterval<T> scaleWithoutChecks(
RandomAccessibleInterval<T> input,
double scale,
Scale2D scale2D,
Expand Down
Loading