Skip to content

Commit 96c8315

Browse files
tpietzschtpietzsch
committed
Replace calls of Type.copy() that should actually be createVariable()
1 parent c1b4576 commit 96c8315

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

‎src/main/java/net/imglib2/converter/Converters.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public static < A, B extends Type< B > > RandomAccessible< B > convert(
106106
final Converter< ? super A, ? super B > converter,
107107
final B b )
108108
{
109-
return convert2( source, converter, () -> b.copy() );
109+
return convert2( source, converter, () -> b.createVariable() );
110110
}
111111

112112
/**
@@ -156,7 +156,7 @@ public static < A, B extends Type< B > > RandomAccessible< B > convert(
156156
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
157157
final B b )
158158
{
159-
return convert2( source, converterSupplier, () -> b.copy() );
159+
return convert2( source, converterSupplier, () -> b.createVariable() );
160160
}
161161

162162
/**
@@ -239,7 +239,7 @@ public static < A, B extends Type< B > > RandomAccessibleInterval< B > convert(
239239
final Converter< ? super A, ? super B > converter,
240240
final B b )
241241
{
242-
return convert2( source, converter, () -> b.copy() );
242+
return convert2( source, converter, () -> b.createVariable() );
243243
}
244244

245245
/**
@@ -290,7 +290,7 @@ public static < A, B extends Type< B > > RandomAccessibleInterval< B > convert(
290290
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
291291
final B b )
292292
{
293-
return convert2( source, converterSupplier, () -> b.copy() );
293+
return convert2( source, converterSupplier, () -> b.createVariable() );
294294
}
295295

296296
/**
@@ -514,7 +514,7 @@ public static < A, B extends Type< B > > IterableRealInterval< B > convert(
514514
final Converter< ? super A, ? super B > converter,
515515
final B b )
516516
{
517-
return convert2( source, converter, () -> b.copy() );
517+
return convert2( source, converter, () -> b.createVariable() );
518518
}
519519

520520
/**
@@ -562,7 +562,7 @@ public static < A, B extends Type< B > > IterableRealInterval< B > convert(
562562
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
563563
final B b )
564564
{
565-
return convert2( source, converterSupplier, () -> b.copy() );
565+
return convert2( source, converterSupplier, () -> b.createVariable() );
566566
}
567567

568568
/**
@@ -631,7 +631,7 @@ public static < A, B extends Type< B > > IterableInterval< B > convert(
631631
final Converter< ? super A, ? super B > converter,
632632
final B b )
633633
{
634-
return convert2( source, converter, () -> b.copy() );
634+
return convert2( source, converter, () -> b.createVariable() );
635635
}
636636

637637
/**
@@ -679,7 +679,7 @@ public static < A, B extends Type< B > > IterableInterval< B > convert(
679679
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
680680
final B b )
681681
{
682-
return convert2( source, converterSupplier, () -> b.copy() );
682+
return convert2( source, converterSupplier, () -> b.createVariable() );
683683
}
684684

685685
/**
@@ -816,7 +816,7 @@ public static < A, B extends Type< B > > RealRandomAccessibleRealInterval< B > c
816816
final Converter< ? super A, ? super B > converter,
817817
final B b )
818818
{
819-
return convert2( source, converter, () -> b.copy() );
819+
return convert2( source, converter, () -> b.createVariable() );
820820
}
821821

822822
/**
@@ -866,7 +866,7 @@ public static < A, B extends Type< B > > RealRandomAccessibleRealInterval< B > c
866866
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
867867
final B b )
868868
{
869-
return convert2( source, converterSupplier, () -> b.copy() );
869+
return convert2( source, converterSupplier, () -> b.createVariable() );
870870
}
871871

872872
/**
@@ -913,7 +913,7 @@ public static < A, B extends Type< B > > RealRandomAccessible< B > convert(
913913
final Converter< ? super A, ? super B > converter,
914914
final B b )
915915
{
916-
return convert2( source, converter, () -> b.copy() );
916+
return convert2( source, converter, () -> b.createVariable() );
917917
}
918918

919919
/**
@@ -963,7 +963,7 @@ public static < A, B extends Type< B > > RealRandomAccessible< B > convert(
963963
final Supplier< Converter< ? super A, ? super B > > converterSupplier,
964964
final B b )
965965
{
966-
return convert2( source, converterSupplier, () -> b.copy() );
966+
return convert2( source, converterSupplier, () -> b.createVariable() );
967967
}
968968

969969
/**
@@ -1132,7 +1132,7 @@ public static < A extends RealType< A >, B extends Type< B > > RandomAccessibleI
11321132
return composeReal2(
11331133
components,
11341134
composer,
1135-
() -> targetType.copy() );
1135+
() -> targetType.createVariable() );
11361136
}
11371137

11381138
/**
@@ -1181,7 +1181,7 @@ public static < A extends NumericType< A >, B extends Type< B > > RandomAccessib
11811181
return composeNumeric2(
11821182
components,
11831183
composer,
1184-
() -> targetType.copy() );
1184+
() -> targetType.createVariable() );
11851185
}
11861186

11871187
/**
@@ -1230,7 +1230,7 @@ public static < A, B extends Type< B > > RandomAccessibleInterval< B > compose(
12301230
return compose2(
12311231
components,
12321232
composer,
1233-
() -> targetType.copy() );
1233+
() -> targetType.createVariable() );
12341234
}
12351235

12361236
/**
@@ -1282,7 +1282,7 @@ public static < A, B, C extends Type< C > > RandomAccessible< C > convert(
12821282
final BiConverter< ? super A, ? super B, ? super C > converter,
12831283
final C c )
12841284
{
1285-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1285+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
12861286
}
12871287

12881288
/**
@@ -1337,7 +1337,7 @@ public static < A, B, C extends Type< C > > RandomAccessible< C > convert(
13371337
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
13381338
final C c )
13391339
{
1340-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
1340+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
13411341
}
13421342

13431343
/**
@@ -1392,7 +1392,7 @@ public static < A, B, C extends Type< C > > RandomAccessibleInterval< C > conver
13921392
final BiConverter< ? super A, ? super B, ? super C > converter,
13931393
final C c )
13941394
{
1395-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1395+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
13961396
}
13971397

13981398
/**
@@ -1447,7 +1447,7 @@ public static < A, B, C extends Type< C > > RandomAccessibleInterval< C > conver
14471447
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
14481448
final C c )
14491449
{
1450-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
1450+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
14511451
}
14521452

14531453
/**
@@ -1635,7 +1635,7 @@ public static < A, B, C extends Type< C > > IterableInterval< C > convert(
16351635
final BiConverter< ? super A, ? super B, ? super C > converter,
16361636
final C c )
16371637
{
1638-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1638+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
16391639
}
16401640

16411641
/**
@@ -1688,7 +1688,7 @@ public static < A, B, C extends Type< C > > IterableInterval< C > convert(
16881688
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
16891689
final C c )
16901690
{
1691-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
1691+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
16921692
}
16931693

16941694
/**
@@ -1741,7 +1741,7 @@ public static < A, B, C extends Type< C > > IterableRealInterval< C > convert(
17411741
final BiConverter< ? super A, ? super B, ? super C > converter,
17421742
final C c )
17431743
{
1744-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1744+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
17451745
}
17461746

17471747
/**
@@ -1794,7 +1794,7 @@ public static < A, B, C extends Type< C > > IterableRealInterval< C > convert(
17941794
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
17951795
final C c )
17961796
{
1797-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
1797+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
17981798
}
17991799

18001800
/**
@@ -1848,7 +1848,7 @@ public static < A, B, C extends Type< C > > RealRandomAccessibleRealInterval< C
18481848
final BiConverter< ? super A, ? super B, ? super C > converter,
18491849
final C c )
18501850
{
1851-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1851+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
18521852
}
18531853

18541854
/**
@@ -1903,7 +1903,7 @@ public static < A, B, C extends Type< C > > RealRandomAccessibleRealInterval< C
19031903
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
19041904
final C c )
19051905
{
1906-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
1906+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
19071907
}
19081908

19091909
/**
@@ -1958,7 +1958,7 @@ public static < A, B, C extends Type< C > > RealRandomAccessible< C > convert(
19581958
final BiConverter< ? super A, ? super B, ? super C > converter,
19591959
final C c )
19601960
{
1961-
return convert2( sourceA, sourceB, converter, () -> c.copy() );
1961+
return convert2( sourceA, sourceB, converter, () -> c.createVariable() );
19621962
}
19631963

19641964
/**
@@ -2013,7 +2013,7 @@ public static < A, B, C extends Type< C > > RealRandomAccessible< C > convert(
20132013
final Supplier< BiConverter< ? super A, ? super B, ? super C > > converterSupplier,
20142014
final C c )
20152015
{
2016-
return convert2( sourceA, sourceB, converterSupplier, () -> c.copy() );
2016+
return convert2( sourceA, sourceB, converterSupplier, () -> c.createVariable() );
20172017
}
20182018

20192019
/**

‎src/main/java/net/imglib2/interpolation/neighborsearch/InverseDistanceWeightingInterpolator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public InverseDistanceWeightingInterpolator( final KNearestNeighborSearch< T > s
8484
p2 = p / 2.0;
8585

8686
search.search( this );
87-
this.value = search.getSampler( 0 ).get().copy();
87+
this.value = search.getSampler( 0 ).getType().createVariable();
8888
this.numNeighbors = search.getK();
8989
}
9090

‎src/main/java/net/imglib2/outofbounds/OutOfBoundsRandomValue.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected OutOfBoundsRandomValue( final OutOfBoundsRandomValue< T > outOfBounds
6060
{
6161
super( outOfBounds );
6262

63-
this.value = outOfBounds.value.copy();
63+
this.value = outOfBounds.value.createVariable();
6464
this.minValue = outOfBounds.minValue;
6565
this.maxValue = outOfBounds.maxValue;
6666
this.range = outOfBounds.range;

‎src/main/java/net/imglib2/outofbounds/OutOfBoundsRandomValueFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@ public void setRandom( final Random rnd )
7878
@Override
7979
public OutOfBoundsRandomValue< T > create( final F f )
8080
{
81-
return new OutOfBoundsRandomValue< T >( f, value.copy(), rnd, min, max );
81+
return new OutOfBoundsRandomValue< T >( f, value.createVariable(), rnd, min, max );
8282
}
8383
}

0 commit comments

Comments
 (0)