2025.02.02 (1.54n7; 1.54m16 histogram regression)

rasband · rasband · commit e8002ff51fa1 · 2025-02-02T16:44:13.000-05: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.54n";
-	public static final String BUILD = "6";
+	public static final String BUILD = "7";
 	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/HistogramPlot.java b/ij/gui/HistogramPlot.java
@@ -304,7 +304,10 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 			}
 			ip.setJustification(ImageProcessor.LEFT_JUSTIFY);
 		}        
-		double binWidth = (hmax-hmin+1)/stats.nBins;
+		double range = hmax-hmin;
+		if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)
+			range = 256;
+		double binWidth = range/stats.nBins;
 		binWidth = Math.abs(binWidth);
 		showBins = binWidth!=1.0 || !fixedRange;
 		col1 = XMARGIN + 5;
diff --git a/ij/gui/HistogramWindow.java b/ij/gui/HistogramWindow.java
@@ -440,7 +440,10 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 			}
 			ip.setJustification(ImageProcessor.LEFT_JUSTIFY);
 		}        
-		double binWidth = (hmax-hmin+1)/stats.nBins;
+		double range = hmax-hmin;
+		if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)
+			range = 256;
+		double binWidth = range/stats.nBins;
 		binWidth = Math.abs(binWidth);
 		showBins = binWidth!=1.0 || !fixedRange;
 		col1 = XMARGIN + 5;
diff --git a/ij/process/FloatStatistics.java b/ij/process/FloatStatistics.java
@@ -86,7 +86,7 @@ void getStatistics(ImageProcessor ip, double minThreshold, double maxThreshold)
 			if (max>histMax)
 				max = histMax;
 		}
-		binSize = (histMax-histMin+1)/nBins;
+		binSize = (histMax-histMin)/nBins;
 
 		// Generate histogram
 		double scale = nBins/(histMax-histMin);
diff --git a/release-notes.html b/release-notes.html
@@ -6,14 +6,15 @@
 <body>
 
 
-<li> <u>1.54n6  26 January 2025</u>
+<li> <u>1.54n7  02 February 2025</u>
 <ul>
 <li> Thanks to Christophe Leterrier, fixed bugs with how
 the <i>Image&gt;Stacks&gt;Tools&gt;Combine</i> and
 <i>Edit&gt;Selection&gt;Straighten</i> commands handle
 multi-channel images.
 <li> Thanks to Murilo Spineli, fixed crashes with processes
-started by exec() macro function.
+started by the exec() macro function.
+<li> Thanks to Guenter Pudmich, fixed 1.54m16 float histogram regression.
 </ul>
 
 <li> <u>1.54m  5 December 2024</u>

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,10 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {`
`304`	`304`	`}`
`305`	`305`	`ip.setJustification(ImageProcessor.LEFT_JUSTIFY);`
`306`	`306`	`}`
`307`		`- double binWidth = (hmax-hmin+1)/stats.nBins;`
	`307`	`+ double range = hmax-hmin;`
	`308`	`+ if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)`
	`309`	`+ range = 256;`
	`310`	`+ double binWidth = range/stats.nBins;`
`308`	`311`	`binWidth = Math.abs(binWidth);`
`309`	`312`	`showBins = binWidth!=1.0 \|\| !fixedRange;`
`310`	`313`	`col1 = XMARGIN + 5;`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,10 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {`
`440`	`440`	`}`
`441`	`441`	`ip.setJustification(ImageProcessor.LEFT_JUSTIFY);`
`442`	`442`	`}`
`443`		`- double binWidth = (hmax-hmin+1)/stats.nBins;`
	`443`	`+ double range = hmax-hmin;`
	`444`	`+ if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)`
	`445`	`+ range = 256;`
	`446`	`+ double binWidth = range/stats.nBins;`
`444`	`447`	`binWidth = Math.abs(binWidth);`
`445`	`448`	`showBins = binWidth!=1.0 \|\| !fixedRange;`
`446`	`449`	`col1 = XMARGIN + 5;`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ void getStatistics(ImageProcessor ip, double minThreshold, double maxThreshold)`
`86`	`86`	`if (max>histMax)`
`87`	`87`	`max = histMax;`
`88`	`88`	`}`
`89`		`- binSize = (histMax-histMin+1)/nBins;`
	`89`	`+ binSize = (histMax-histMin)/nBins;`
`90`	`90`
`91`	`91`	`// Generate histogram`
`92`	`92`	`double scale = nBins/(histMax-histMin);`