2025.05.18 (1.54q14; AVI Reader)

rasband · rasband · commit 4f42db313490 · 2025-05-18T15:01:36.000-04:00
diff --git a/ij/ImageJ.java b/ij/ImageJ.java
@@ -79,7 +79,7 @@ public class ImageJ extends Frame implements ActionListener,
 
 	/** Plugins should call IJ.getVersion() or IJ.getFullVersion() to get the version string. */
 	public static final String VERSION = "1.54q";
-	public static final String BUILD = "13";
+	public static final String BUILD = "14";
 	public static Color backgroundColor = new Color(237,237,237);
 	/** SansSerif, 12-point, plain font. */
 	public static final Font SansSerif12 = new Font("SansSerif", Font.PLAIN, 12);
diff --git a/ij/plugin/AVI_Reader.java b/ij/plugin/AVI_Reader.java
@@ -1207,12 +1207,12 @@ private Object readFixedLengthFrame (RandomAccessFile rFile, int size)	throws Ex
 		byte[] bPixels = null;
 		int[] cPixels = null;
 		short[] sPixels = null;
-		if (biBitCount <=8 || convertToGray) {
-			bPixels = new byte[dwWidth * biHeight];
-			pixels = bPixels;
-		} else if (biBitCount == 16 && dataCompression == NO_COMPRESSION) {
+		if (biBitCount == 16 && dataCompression == NO_COMPRESSION) {
 			sPixels = new short[dwWidth * biHeight];
 			pixels = sPixels;
+		} else if (biBitCount <=8 || convertToGray) {
+			bPixels = new byte[dwWidth * biHeight];
+			pixels = bPixels;
 		} else {
 			cPixels = new int[dwWidth * biHeight];
 			pixels = cPixels;
@@ -1223,12 +1223,12 @@ private Object readFixedLengthFrame (RandomAccessFile rFile, int size)	throws Ex
 			int	 offset		= topDown ? 0 : (biHeight-1)*dwWidth;
 			int	 rawOffset	= 0;
 			for (int i = biHeight - 1; i >= 0; i--) {  //for all lines
-				if (biBitCount <=8 || isPlanarFormat)
+				if (biBitCount==16 && dataCompression == NO_COMPRESSION)
+					unpackShort(rawData, rawOffset, sPixels, offset, dwWidth);
+				else if (biBitCount <=8 || isPlanarFormat) //planar&converToGray: read 1st plane (Y)
 					unpack8bit(rawData, rawOffset, bPixels, offset, dwWidth);
 				else if (convertToGray)
 					unpackGray(rawData, rawOffset, bPixels, offset, dwWidth);
-				else if (biBitCount==16 && dataCompression == NO_COMPRESSION)
-					unpackShort(rawData, rawOffset, sPixels, offset, dwWidth);
 				else
 					unpack(rawData, rawOffset, cPixels, offset, dwWidth);
 				rawOffset += isPlanarFormat ? dwWidth : scanLineSize;
diff --git a/release-notes.html b/release-notes.html
@@ -6,7 +6,7 @@
 <body>
 
 
-<li> <u>1.54q13  12 April 2025</u>
+<li> <u>1.54q14  12 April 2025</u>
 <ul>
 <li> Thanks to 'aschain', the 3D filters in the <i>Process&gt;Filters</i>
 menu now work with hyperstacks.
@@ -30,6 +30,8 @@
 command did not correctly set the dimensions.
 <li> Thanks to Christian Tischer, fixed bug where the ChanneSplitter.split()
 method failed in Fiji headless mode.
+<li> Thanks to Michael Schmid, fixed bug with opening a 16-bit AVI with
+"Convert to grayscale" causing an ArrayIndexOutOfBoundsException.
 <li> Thanks to Michael Schmid, fixed 1.54m9 <i>Analyze&gt;Plot Profile</i>
 regression where ImageProcessor.getLine() did not sample the
 correct points.
