Projects >> imglib2 >>062cfb8ae71e5ee97b6f5a2cac02718f017c5e8b

Chunk
Conflicting content 
import net.imglib2.util.Util;

/**
<<<<<<< HEAD
 * A {@link NativeType native} {@link NumericType} that encodes four channels
 * at unsigned byte precision into one 32bit signed integer which is the format
 * used in most display oriented image processing libraries such as AWT or
 * ImageJ.  {@link ARGBType} implements {@link NumericType} as element-wise
 * vector algebra.
=======
 * TODO
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
 * 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld
Solution content 
import net.imglib2.util.Util;

/**
 * A {@link NativeType native} {@link NumericType} that encodes four channels at
 * unsigned byte precision into one 32bit signed integer which is the format
 * used in most display oriented image processing libraries such as AWT or
 * ImageJ. {@link ARGBType} implements {@link NumericType} as element-wise
 * vector algebra.
 * 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld
File
ARGBType.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
<<<<<<< HEAD
public class ARGBType extends AbstractNativeType< ARGBType > implements NumericType< ARGBType >
{
	final protected NativeImg< ?, ? extends IntAccess > img;
	
	// the DataAccess that holds the information 
=======
final public class ARGBType extends AbstractNativeType< ARGBType > implements NumericType< ARGBType >
{
	final protected NativeImg< ARGBType, ? extends IntAccess > img;

	// the DataAccess that holds the information
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
	protected IntAccess dataAccess;

	// this is the constructor if you want it to read from an array
Solution content 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
public class ARGBType extends AbstractNativeType< ARGBType > implements NumericType< ARGBType >
{
	final protected NativeImg< ?, ? extends IntAccess > img;

	// the DataAccess that holds the information
	protected IntAccess dataAccess;

	// this is the constructor if you want it to read from an array
File
ARGBType.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class signature
Comment
Chunk
Conflicting content 
	protected IntAccess dataAccess;

	// this is the constructor if you want it to read from an array
<<<<<<< HEAD
	public ARGBType( NativeImg< ?, ? extends IntAccess > intStorage )
=======
	public ARGBType( final NativeImg< ARGBType, ? extends IntAccess > byteStorage )
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
	{
		img = intStorage;
	}
Solution content 
	protected IntAccess dataAccess;

	// this is the constructor if you want it to read from an array
	public ARGBType( final NativeImg< ?, ? extends IntAccess > intStorage )
	{
		img = intStorage;
	}
File
ARGBType.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
	}

	// this is the constructor if you want it to be a variable
<<<<<<< HEAD
	public GenericByteType() { this( ( byte )0 ); }
=======
	protected GenericByteType()
	{
		this( ( byte ) 0 );
	}
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034

	@Override
	public int getEntitiesPerPixel()
Solution content 
	}

	// this is the constructor if you want it to be a variable
	public GenericByteType()
	{
		this( ( byte ) 0 );
	}

	@Override
	public int getEntitiesPerPixel()
File
GenericByteType.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
import net.imglib2.util.Util;

/**
<<<<<<< HEAD
 * Abstract base class for {@link NativeType native} {@link IntegerType}s that
 * encode their value into a 16bit short.
 *
=======
 * TODO
 * 
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
Solution content 
import net.imglib2.util.Util;

/**
 * Abstract base class for {@link NativeType native} {@link IntegerType}s that
 * encode their value into a 16bit short.
 * 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
File
GenericShortType.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
<<<<<<< HEAD
public abstract class GenericShortType< T extends GenericShortType< T > >
	extends AbstractIntegerType< T >
	implements NativeType< T >
=======
public abstract class GenericShortType< T extends GenericShortType< T >> extends AbstractIntegerType< T > implements NativeType< T >
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
{
	int i = 0;
Solution content 
 * @author Stephan Preibisch
 * @author Stephan Saalfeld 
 */
public abstract class GenericShortType< T extends GenericShortType< T > >
		extends AbstractIntegerType< T >
		implements NativeType< T >
{
	int i = 0;
File
GenericShortType.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
/**
 * Something volatile that has a value and is either VALID or INVALID.
<<<<<<< HEAD
 *
 * @author Stephan Saalfeld 
=======
 * 
 * @author Stephan Saalfeld 
>>>>>>> bf06d43b337f7726eee8829f50c910d28a51b034
 */
public class VolatileNumericType< T extends NumericType< T > > extends AbstractVolatileNumericType< T, VolatileNumericType< T > >
{
Solution content 
/**
 * Something volatile that has a value and is either VALID or INVALID.
 * 
 * @author Stephan Saalfeld 
 */
public class VolatileNumericType< T extends NumericType< T > > extends AbstractVolatileNumericType< T, VolatileNumericType< T > >
{
File
VolatileNumericType.java
Developer's decision
Version 1
Kind of conflict
Comment