2024.07.10 (1.54k10; Image>Duplicate)

rasband · rasband · commit b9b7f9386c38 · 2024-07-02T09:21:01.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.54k";
-	public static final String BUILD = "8";
+	public static final String BUILD = "10";
 	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/macro/Functions.java b/ij/macro/Functions.java
@@ -3194,9 +3194,9 @@ void setFont() {
 				String styles = getLastString().toLowerCase();
 				if (styles.contains("bold")) style += Font.BOLD;
 				if (styles.contains("italic")) style += Font.ITALIC;
-				if (styles.contains("non-")||styles.contains("no-")) antialiasedText=false;
 				if (styles.contains("nonscal")) nonScalableText=true;
 				if (styles.contains("anti")) antialiasedText=true;
+				if (styles.contains("non-")||styles.contains("no-")) antialiasedText=false;
 			} else
 				interp.getRightParen();
 		}
diff --git a/ij/plugin/Duplicator.java b/ij/plugin/Duplicator.java
@@ -45,11 +45,12 @@ public void run(String arg) {
 			Rectangle bounds = imp.getRoi().getBounds();
 			imp.setRoi(bounds);
 		}
+		boolean roiOutside = false;
 		if (roiA!=null) {
 			Rectangle r = roiA.getBounds();
 			if (r.x>=imp.getWidth() || r.y>=imp.getHeight() || r.x+r.width<=0 || r.y+r.height<=0) {
-				IJ.error("Roi is outside image");
-				return;
+				ignoreSelection = true;
+				roiOutside = true;
 			}
 		}
 		int stackSize = imp.getStackSize();
@@ -87,7 +88,8 @@ else if (duplicateStack || imp.getStackSize()==1) {
 		}
 		if (ignoreSelection && roi!=null) {
 			imp.setRoi(roi);
-			imp2.setRoi((Roi)roi.clone());
+			if (!roiOutside)
+				imp2.setRoi((Roi)roi.clone());
 		}
 		Calibration cal = imp2.getCalibration();
 		if (roi!=null && (cal.xOrigin!=0.0||cal.yOrigin!=0.0)) {
diff --git a/release-notes.html b/release-notes.html
@@ -5,8 +5,11 @@
 </head>
 <body>
 
-<li> <u>1.54k8  28 June 2024</u>
+<li> <u>1.54k10  2 July 2024</u>
 <ul>
+<li> Thanks to Bram van den Broek, the <i>Image&gt;Duplicate</i>
+command enables the "Ignore Selection" option when the ROI is 
+outside the image.
 <li> Thanks to Herbie Gluender, the <i>Image&gt;Duplicate</i>
 command retains the selection when "Ignore Selection" is
 checked in the dialog.
@@ -22,6 +25,9 @@
 <li> Thanks to Philippe Carl and Michael Schmid, fixed bug
 where the roiManager("select",index) macro function did
 not remove previous selections.
+<li> Thanks to Oleg Dobrokhotov, fixed bug with the
+"non-antialiased" option of the setFont() macro
+function to not work as expected.
 <li> Thanks to Felix Rudolphi and Curtis Rueden, fixed a
 1.54i regression that caused FileOpener to throw
 HeadlessExceptions in headless environments.

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,12 @@ public void run(String arg) {`
`45`	`45`	`Rectangle bounds = imp.getRoi().getBounds();`
`46`	`46`	`imp.setRoi(bounds);`
`47`	`47`	`}`
	`48`	`+ boolean roiOutside = false;`
`48`	`49`	`if (roiA!=null) {`
`49`	`50`	`Rectangle r = roiA.getBounds();`
`50`	`51`	`if (r.x>=imp.getWidth() \|\| r.y>=imp.getHeight() \|\| r.x+r.width<=0 \|\| r.y+r.height<=0) {`
`51`		`- IJ.error("Roi is outside image");`
`52`		`- return;`
	`52`	`+ ignoreSelection = true;`
	`53`	`+ roiOutside = true;`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`int stackSize = imp.getStackSize();`
`@@ -87,7 +88,8 @@ else if (duplicateStack \|\| imp.getStackSize()==1) {`
`87`	`88`	`}`
`88`	`89`	`if (ignoreSelection && roi!=null) {`
`89`	`90`	`imp.setRoi(roi);`
`90`		`- imp2.setRoi((Roi)roi.clone());`
	`91`	`+ if (!roiOutside)`
	`92`	`+ imp2.setRoi((Roi)roi.clone());`
`91`	`93`	`}`
`92`	`94`	`Calibration cal = imp2.getCalibration();`
`93`	`95`	`if (roi!=null && (cal.xOrigin!=0.0\|\|cal.yOrigin!=0.0)) {`