2024.02.29 (1.54i25; CellImgToVirtualStackTest)

imagej · Feb 29, 2024 · 7579e16 · 7579e16
1 parent efe000b
commit 7579e16
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 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.54i";
-	public static final String BUILD = "21";
+	public static final String BUILD = "25";
 	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/ImagePlus.java b/ij/ImagePlus.java
@@ -843,15 +843,13 @@ else if (nScrollbars==0 && newStackSize>1)
     	if (currentSlice<1) setCurrentSlice(1);
     	boolean resetCurrentSlice = currentSlice>newStackSize;
     	if (resetCurrentSlice) setCurrentSlice(newStackSize);
-    	ImageProcessor ip = newStack.getProcessor(currentSlice);
-    	if (newStack.isVirtual()) // work around bug with cached virtual stacks
-    		ip = ip.duplicate();
-    	boolean dimensionsChanged = width>0 && height>0 && (width!=ip.getWidth()||height!=ip.getHeight());
+    	ImageProcessor newIP = newStack.getProcessor(currentSlice);
+    	boolean dimensionsChanged = width>0 && height>0 && (width!=newIP.getWidth()||height!=newIP.getHeight());
     	if (this.stack==null)
     	    newStack.viewers(+1);
     	this.stack = newStack;
     	oneSliceStack = false;
-    	setProcessor2(title, ip, newStack);
+    	setProcessor2(title, newIP, newStack);
 		if (bitDepth1!=0 && bitDepth1!=getBitDepth())
 			compositeChanges = true;
 		if (compositeChanges && (this instanceof CompositeImage)) {

diff --git a/ij/VirtualStack.java b/ij/VirtualStack.java
@@ -133,7 +133,6 @@ public Object getPixels(int n) {
 			return null;
 	}		
 
-	/** Assigns a pixel array to the specified slice, where {@literal 1<=n<=nslices}. */
 	public void setPixels(Object pixels, int n) {
 	}
 

diff --git a/ij/gui/Toolbar.java b/ij/gui/Toolbar.java
@@ -951,7 +951,7 @@ public static void setForegroundColor(Color c) {
 		if (!IJ.isMacro()) setRoiColor(c);
 		ImagePlus imp = WindowManager.getCurrentImage();
 		if (imp!=null)
-			imp.getProcessor().setFillValueSet(false);
+			imp.getProcessor().fillColorSet(false);
 	}
 
 	public static Color getBackgroundColor() {

diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -770,7 +770,7 @@ void setColor() {
 				if (overlayPath!=null)
 					addDrawingToOverlay(imp);
 				getProcessor().setColor(globalColor);
-				getProcessor().setFillValueSet(true);				
+				getProcessor().fillColorSet(true);				
 			}
 			interp.getRightParen();
 			return;
@@ -788,7 +788,7 @@ void setColor() {
 		globalValue = Double.NaN;
 		if (WindowManager.getCurrentImage()!=null) {
 			getProcessor().setColor(globalColor);
-			getProcessor().setFillValueSet(true);				
+			getProcessor().fillColorSet(true);				
 		}				
 	}
 
@@ -814,6 +814,7 @@ void setColor(double value) {
 		}
 		globalValue = value;
 		globalColor = null;
+		ip.fillColorSet(true);				
 	}
 
 	void makeLine() {

diff --git a/ij/process/ByteProcessor.java b/ij/process/ByteProcessor.java
@@ -107,7 +107,7 @@ public Image createImage() {
 		return createBufferedImage();
 	}
 
-	Image createBufferedImage() {
+	synchronized Image createBufferedImage() {
 		if (raster==null) {
 			SampleModel sm = getIndexSampleModel();
 			DataBuffer db = new DataBufferByte(pixels, width*height, 0);
@@ -409,7 +409,7 @@ public Object getPixelsCopy() {
 		}
 	}
 
-	public void setPixels(Object pixels) {
+	public synchronized void setPixels(Object pixels) {
 		if (pixels!=null && this.pixels!=null && (((byte[])pixels).length!=this.pixels.length))
 			throw new IllegalArgumentException("");
 		this.pixels = (byte[])pixels;

diff --git a/ij/process/ImageProcessor.java b/ij/process/ImageProcessor.java
@@ -78,6 +78,7 @@ public abstract class ImageProcessor implements Cloneable {
 	private boolean noReset;
 	private boolean histogram16;
 	private boolean addOne;
+	private boolean fillColorSet;
 
     ProgressBar progressBar;
 	protected int width, snapshotWidth;
@@ -114,7 +115,6 @@ public abstract class ImageProcessor implements Cloneable {
 	protected boolean minMaxSet;
 	protected static double seed = Double.NaN;
 	protected static Random rnd;
-	protected boolean fillValueSet;
 
 	protected void showProgress(double percentDone) {
 		if (progressBar!=null)
@@ -443,7 +443,7 @@ public void setColor(double value) {
 
 	/** Returns 'true' if the fill/draw value has been set in a macro. */
 	public boolean fillValueSet() {
-		return fillValueSet;
+		return fillColorSet;
 	}
 
 	/** Sets the background fill value used by the rotate() and scale() methods. */
@@ -2973,8 +2973,8 @@ protected static IndexColorModel getThresholdColorModel(byte[]reds, byte[] green
 	}
 
 	/** For internal use */
-	public void setFillValueSet(boolean set) {
-		fillValueSet = set;
+	public void fillColorSet(boolean set) {
+		fillColorSet = set;
 	}
 
 }
diff --git a/release-notes.html b/release-notes.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 
-<li> <u>1.54i21  24 February 2024</u>
+<li> <u>1.54i25  29 February 2024</u>
 <ul>
 <li> Thanks to Fred Damen, hex notation (e.g., "0xff00ff") can be 
 used in GenericDialog numeric fields.
@@ -47,6 +47,9 @@
 "No particles detected. The threshold may not be correct." message.
 <li> Fixed v1.49r regression that caused invalid "Save changes..." dialog after
 running macro in the Editor.
+<li> Thanks to Curtis Rueden, fixed a ImageJ 1.54h regression that breaks
+the imglib2
+<a href="https://github.com/imglib/imglib2-ij/issues/39#issuecomment-1969692839">CellImgToVirtualStackTest</a>.
 </ul>
 
 <li> <u>1.54h  15 December 2023</u>