Merge pull request #4214 from sbesson/issue_4209

Fix incorrect logical operators in Zeiss LSM and OME-XML readers
ome · Jul 29, 2024 · 0a895ae · 0a895ae
2 parents 678fd01 + 198c4a6
commit 0a895ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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");
       }
 

diff --git 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();