Merge pull request #487 from jburel/issue_486

jburel · web-flow · commit 45cecbd5d73e · 2026-02-16T14:11:17.000Z
ImageJ usage: Check the class of the correct variable
diff --git a/src/main/java/org/openmicroscopy/shoola/util/roi/io/ROIReader.java b/src/main/java/org/openmicroscopy/shoola/util/roi/io/ROIReader.java
@@ -381,7 +381,7 @@ private List<ROIData> read(long imageID, Roi[] rois)
                         if (shape != null) {
                             roiData.addShapeData(shape);
                         }
-                    } else if (shapeij instanceof PolygonRoi || r instanceof EllipseRoi) {
+                    } else if (shapeij instanceof PolygonRoi || shapeij instanceof EllipseRoi) {
                         if (type.matches("Point")) {
                             convertPoint((PointRoi) shapeij, roiData);
                         } else if (type.matches("Polyline") ||

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ private List<ROIData> read(long imageID, Roi[] rois)`
`381`	`381`	`if (shape != null) {`
`382`	`382`	`roiData.addShapeData(shape);`
`383`	`383`	`}`
`384`		`- } else if (shapeij instanceof PolygonRoi \|\| r instanceof EllipseRoi) {`
	`384`	`+ } else if (shapeij instanceof PolygonRoi \|\| shapeij instanceof EllipseRoi) {`
`385`	`385`	`if (type.matches("Point")) {`
`386`	`386`	`convertPoint((PointRoi) shapeij, roiData);`
`387`	`387`	`} else if (type.matches("Polyline") \|\|`