2024.09.14 (1.54k23; Array.concatenate)

imagej · Sep 14, 2024 · 662feed · 662feed
1 parent da0931c
commit 662feed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
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.54k";
-	public static final String BUILD = "21";
+	public static final String BUILD = "23";
 	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/gui/GenericDialog.java b/ij/gui/GenericDialog.java
@@ -2050,8 +2050,8 @@ else if (dialogTitle.endsWith(":"))	//remove trailing colon
 					path = directory+name;
 			}
 			if (path!=null) {
-				if (IJ.isWindows())
-					path = path.replaceAll("\\\\", "/"); // replace "\" with "/"
+				//if (IJ.isWindows())
+				//	path = path.replaceAll("\\\\", "/"); // replace "\" with "/"
 				this.textField.setText(path);
 			}
 		}

diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -623,17 +623,17 @@ Variable[] getArray() {
 			}
 		}
 		boolean newArray = interp.token==ARRAY_FUNCTION && pgm.table[interp.tokenAddress].type==NEW_ARRAY;
-		boolean arrayFunction = interp.token==ARRAY_FUNCTION && pgm.table[interp.tokenAddress].type==ARRAY_FUNC;
+		boolean arrayFunction = interp.token==ARRAY_FUNCTION;
 		if (!(interp.token==WORD||newArray||arrayFunction))
 			interp.error("Array expected");
 		Variable[] a = null;
 		if (newArray)
 			a = getArrayFunction(NEW_ARRAY);
 		else if (arrayFunction)
-			a = getArrayFunction(ARRAY_FUNC);
+			a = getArrayFunction(pgm.table[interp.tokenAddress].type);
 		else {
 			Variable v = interp.lookupVariable();
-			a= v.getArray();
+			a = v.getArray();
 			int size = v.getArraySize();
 			if (a!=null && a.length!=size) {
 				Variable[] a2 = new Variable[size];

diff --git a/release-notes.html b/release-notes.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 
-<li> <u>1.54k21  10 September 2024</u>
+<li> <u>1.54k23  14 September 2024</u>
 <ul>
 <li> Thanks to 'Carlos', added the RoiManager.delete(index) macro function DOC
 and the RoiManager.delete(index) method.
@@ -60,6 +60,9 @@
 segmented line selection iterators when the line was
 completely straight vertically or
 horizontally.
+<li> Thanks to Christophe Leterrier, fixed bug with the
+Array.concat() macro function not accepting getList()
+as an argument.
 <li> Thanks to Felix Rudolphi and Curtis Rueden, fixed a
 1.54i regression that caused FileOpener to throw
 HeadlessExceptions in headless environments.