Projects information

Chunk

Conflicting content
} byte[] read8bitImage(InputStream in) throws IOException { <<<<<<< HEAD if (fi.compression!=FileInfo.COMPRESSION_NONE) ======= if (fi.compression>FileInfo.COMPRESSION_NONE) >>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180 return readCompressed8bitImage(in); byte[] pixels = new byte[nPixels]; // assume contiguous strips

Conflicting content

	}
	
	byte[] read8bitImage(InputStream in) throws IOException {
<<<<<<< HEAD
		if (fi.compression!=FileInfo.COMPRESSION_NONE)
=======
		if (fi.compression>FileInfo.COMPRESSION_NONE)
>>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180
			return readCompressed8bitImage(in);
		byte[] pixels = new byte[nPixels];
		// assume contiguous strips

Solution content
} byte[] read8bitImage(InputStream in) throws IOException { if (fi.compression>FileInfo.COMPRESSION_NONE) return readCompressed8bitImage(in); byte[] pixels = new byte[nPixels]; // assume contiguous strips

Solution content

	}
	
	byte[] read8bitImage(InputStream in) throws IOException {
		if (fi.compression>FileInfo.COMPRESSION_NONE)
			return readCompressed8bitImage(in);
		byte[] pixels = new byte[nPixels];
		// assume contiguous strips

File
ImageReader.java

Developer's decision
Version 2

Kind of conflict
If statement

Chunk

Conflicting content
/** Reads a 16-bit image. Signed pixels are converted to unsigned by adding 32768. */ short[] read16bitImage(InputStream in) throws IOException { <<<<<<< HEAD if (fi.compression!=FileInfo.COMPRESSION_NONE \|\| (fi.stripOffsets!=null&&fi.stripOffsets.length>1)) ======= if (fi.compression>FileInfo.COMPRESSION_NONE \|\| (fi.stripOffsets!=null&&fi.stripOffsets.length>1)) >>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180 return readCompressed16bitImage(in); int pixelsRead; byte[] buffer = new byte[bufferSize];

Conflicting content

	
	/** Reads a 16-bit image. Signed pixels are converted to unsigned by adding 32768. */
	short[] read16bitImage(InputStream in) throws IOException {
<<<<<<< HEAD
		if (fi.compression!=FileInfo.COMPRESSION_NONE || (fi.stripOffsets!=null&&fi.stripOffsets.length>1))
=======
		if (fi.compression>FileInfo.COMPRESSION_NONE || (fi.stripOffsets!=null&&fi.stripOffsets.length>1))
>>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180
			return readCompressed16bitImage(in);
		int pixelsRead;
		byte[] buffer = new byte[bufferSize];

Solution content
/** Reads a 16-bit image. Signed pixels are converted to unsigned by adding 32768. */ short[] read16bitImage(InputStream in) throws IOException { if (fi.compression>FileInfo.COMPRESSION_NONE \|\| (fi.stripOffsets!=null&&fi.stripOffsets.length>1)) return readCompressed16bitImage(in); int pixelsRead; byte[] buffer = new byte[bufferSize];

Solution content

	
	/** Reads a 16-bit image. Signed pixels are converted to unsigned by adding 32768. */
	short[] read16bitImage(InputStream in) throws IOException {
		if (fi.compression>FileInfo.COMPRESSION_NONE || (fi.stripOffsets!=null&&fi.stripOffsets.length>1))
			return readCompressed16bitImage(in);
		int pixelsRead;
		byte[] buffer = new byte[bufferSize];

File
ImageReader.java

Developer's decision
Version 2

Kind of conflict
If statement

Chunk

Conflicting content
int[] readChunkyRGB(InputStream in) throws IOException { if (fi.compression==FileInfo.JPEG) return readJPEG(in); <<<<<<< HEAD else if (fi.compression!=FileInfo.COMPRESSION_NONE) ======= else if (fi.compression>FileInfo.COMPRESSION_NONE) >>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180 return readCompressedChunkyRGB(in); int pixelsRead; bufferSize = 24*width;

Conflicting content

	int[] readChunkyRGB(InputStream in) throws IOException {
		if (fi.compression==FileInfo.JPEG)
			return readJPEG(in);
<<<<<<< HEAD
		else if (fi.compression!=FileInfo.COMPRESSION_NONE)
=======
		else if (fi.compression>FileInfo.COMPRESSION_NONE)
>>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180
			return readCompressedChunkyRGB(in);
		int pixelsRead;
		bufferSize = 24*width;

Solution content
int[] readChunkyRGB(InputStream in) throws IOException { if (fi.compression==FileInfo.JPEG) return readJPEG(in); else if (fi.compression>FileInfo.COMPRESSION_NONE) return readCompressedChunkyRGB(in); int pixelsRead; bufferSize = 24*width;

Solution content

	int[] readChunkyRGB(InputStream in) throws IOException {
		if (fi.compression==FileInfo.JPEG)
			return readJPEG(in);
		else if (fi.compression>FileInfo.COMPRESSION_NONE)
			return readCompressedChunkyRGB(in);
		int pixelsRead;
		bufferSize = 24*width;

File
ImageReader.java

Developer's decision
Version 2

Kind of conflict
If statement

Chunk

Conflicting content
} int[] readPlanarRGB(InputStream in) throws IOException { <<<<<<< HEAD if (fi.compression!=FileInfo.COMPRESSION_NONE) ======= if (fi.compression>FileInfo.COMPRESSION_NONE) >>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180 return readCompressedPlanarRGBImage(in); DataInputStream dis = new DataInputStream(in); int planeSize = nPixels; // 1/3 image size

Conflicting content

	}

	int[] readPlanarRGB(InputStream in) throws IOException {
<<<<<<< HEAD
		if (fi.compression!=FileInfo.COMPRESSION_NONE)
=======
		if (fi.compression>FileInfo.COMPRESSION_NONE)
>>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180
			return readCompressedPlanarRGBImage(in);
		DataInputStream dis = new DataInputStream(in);
		int planeSize = nPixels; // 1/3 image size

Solution content
} int[] readPlanarRGB(InputStream in) throws IOException { if (fi.compression>FileInfo.COMPRESSION_NONE) return readCompressedPlanarRGBImage(in); DataInputStream dis = new DataInputStream(in); int planeSize = nPixels; // 1/3 image size

Solution content

	}

	int[] readPlanarRGB(InputStream in) throws IOException {
		if (fi.compression>FileInfo.COMPRESSION_NONE)
			return readCompressedPlanarRGBImage(in);
		DataInputStream dis = new DataInputStream(in);
		int planeSize = nPixels; // 1/3 image size

File
ImageReader.java

Developer's decision
Version 2

Kind of conflict
If statement

Chunk

Conflicting content
} Object readRGB48(InputStream in) throws IOException { <<<<<<< HEAD if (fi.compression!=FileInfo.COMPRESSION_NONE) ======= if (fi.compression>FileInfo.COMPRESSION_NONE) >>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180 return readCompressedRGB48(in); int channels = 3; short[][] stack = new short[channels][nPixels];

Conflicting content

	}
	
	Object readRGB48(InputStream in) throws IOException {
<<<<<<< HEAD
		if (fi.compression!=FileInfo.COMPRESSION_NONE)
=======
		if (fi.compression>FileInfo.COMPRESSION_NONE)
>>>>>>> e8b389c9719b4554b654eddc9fe9640cad92b180
			return readCompressedRGB48(in);
		int channels = 3;
		short[][] stack = new short[channels][nPixels];

Solution content
} Object readRGB48(InputStream in) throws IOException { if (fi.compression>FileInfo.COMPRESSION_NONE) return readCompressedRGB48(in); int channels = 3; short[][] stack = new short[channels][nPixels];

File
ImageReader.java

Developer's decision
Version 2

Kind of conflict
If statement

Projects >> ImageJA >>ae729c883f6228d98134a9f06535477690a38d19