From cad5a4fc4fc117a3752941e068b446ec9b67b643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 22 Jul 2024 08:40:42 +0100 Subject: [PATCH 1/2] ZeissLSMReader: replace assignment operator by logical and operator --- components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java b/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java index cf7e82bdce1..b33d2a042b4 100644 --- a/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java +++ b/components/formats-gpl/src/loci/formats/in/ZeissLSMReader.java @@ -1134,7 +1134,7 @@ else if (zCoordinates.size() == i) { // if this is not the first channel, copy the color from the // previous channel (necessary for SIM data) // otherwise set the color to white, as this will display better - if (red == 0 && green == 0 & blue == 0) { + if (red == 0 && green == 0 && blue == 0) { if (i > 0 && isSIM) { red = channelColor[i - 1].getRed(); green = channelColor[i - 1].getGreen(); From 198c4a6e45ee5e958571344c7dd55a742faa56ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 22 Jul 2024 08:43:15 +0100 Subject: [PATCH 2/2] OMEXMLReader: replace assignment operator by logical or operator --- components/formats-bsd/src/loci/formats/in/OMEXMLReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/formats-bsd/src/loci/formats/in/OMEXMLReader.java b/components/formats-bsd/src/loci/formats/in/OMEXMLReader.java index 6ce56250894..617ccdca02b 100644 --- a/components/formats-bsd/src/loci/formats/in/OMEXMLReader.java +++ b/components/formats-bsd/src/loci/formats/in/OMEXMLReader.java @@ -290,7 +290,7 @@ protected void initFile(String id) throws FormatException, IOException { Integer t = omexmlMeta.getPixelsSizeT(i).getValue(); Integer z = omexmlMeta.getPixelsSizeZ(i).getValue(); Integer c = omexmlMeta.getPixelsSizeC(i).getValue(); - if (w == null || h == null || t == null || z == null | c == null) { + if (w == null || h == null || t == null || z == null || c == null) { throw new FormatException("Image dimensions not found"); }