Projects information

Chunk

Conflicting content
public FFTConvolution( final RandomAccessibleInterval< R > img, final RandomAccessibleInterval< R > kernel, final RandomAccessibleInterval< R > output, final ImgFactory< ComplexFloatType > factory ) { this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, Util.getTypeFromInterval( kernel ).createVariable() ), kernel, output, factory ); <<<<<<< HEAD // Javac bug workaround: //this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, FFT.getTypeInstance( kernel ) ), kernel, output, factory ); ======= >>>>>>> 39ce99d96d39390a31641cb4ae00d17d9cd0c61e } /**

Conflicting content

	public FFTConvolution( final RandomAccessibleInterval< R > img, final RandomAccessibleInterval< R > kernel, final RandomAccessibleInterval< R > output, final ImgFactory< ComplexFloatType > factory )
	{
		this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, Util.getTypeFromInterval( kernel ).createVariable() ), kernel, output, factory );
<<<<<<< HEAD
		// Javac bug workaround:
		//this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, FFT.getTypeInstance( kernel ) ), kernel, output, factory );
=======
>>>>>>> 39ce99d96d39390a31641cb4ae00d17d9cd0c61e
	}

	/**

Solution content
public FFTConvolution( final RandomAccessibleInterval< R > img, final RandomAccessibleInterval< R > kernel, final RandomAccessibleInterval< R > output, final ImgFactory< ComplexFloatType > factory ) { this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, Util.getTypeFromInterval( kernel ).createVariable() ), kernel, output, factory ); // Javac bug workaround: //this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, FFT.getTypeInstance( kernel ) ), kernel, output, factory ); } /**

Solution content

	public FFTConvolution( final RandomAccessibleInterval< R > img, final RandomAccessibleInterval< R > kernel, final RandomAccessibleInterval< R > output, final ImgFactory< ComplexFloatType > factory )
	{
		this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, Util.getTypeFromInterval( kernel ).createVariable() ), kernel, output, factory );
		// Javac bug workaround:
		//this ( Views.extendMirrorSingle( img ), img, Views.extendValue( kernel, FFT.getTypeInstance( kernel ) ), kernel, output, factory );
	}

	/**

File
FFTConvolution.java

Developer's decision
Version 1

Kind of conflict
Comment

Projects >> imglib2 >>7b4a9d3b23dd96fa0a65e63812b1127534f227f2