diff --git a/ij/ImageJ.java b/ij/ImageJ.java index 9b63dbf2..ce2a24ec 100644 --- 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 index f1a1eb36..9698e23f 100644 --- 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 index 79afcbc8..48b7683c 100644 --- 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 index feb5ad4e..48ec8008 100644 --- a/release-notes.html +++ b/release-notes.html @@ -5,8 +5,11 @@ -
  • 1.54k8 28 June 2024 +
  • 1.54k10 2 July 2024