fix repeated branches

darktable-org · Apr 27, 2022 · 2949e7e · 2949e7e
1 parent d998bb4
commit 2949e7e
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/librawspeed/decoders/RafDecoder.cpp b/src/librawspeed/decoders/RafDecoder.cpp
@@ -121,17 +121,14 @@ void RafDecoder::decodeRawInternal() {
 
   assert(!isCompressed());
 
-  if (8UL * counts->getU32() >= 2UL * 16UL * width * height) {
+  if ((8UL * counts->getU32() >= 2UL * 16UL * width * height)
+      || (8UL * counts->getU32() >= 16UL * width * height)) {
     bps = 16;
-  } else if (8UL * counts->getU32() >= 2UL * 14UL * width * height) {
+  } else if ((8UL * counts->getU32() >= 2UL * 14UL * width * height)
+             || (8UL * counts->getU32() >= 14UL * width * height)) {
     bps = 14;
-  } else if (8UL * counts->getU32() >= 2UL * 12UL * width * height) {
-    bps = 12;
-  } else if (8UL * counts->getU32() >= 16UL * width * height) {
-    bps = 16;
-  } else if (8UL * counts->getU32() >= 14UL * width * height) {
-    bps = 14;
-  } else if (8UL * counts->getU32() >= 12UL * width * height) {
+  } else if ((8UL * counts->getU32() >= 2UL * 12UL * width * height)
+             || (8UL * counts->getU32() >= 12UL * width * height)) {
     bps = 12;
   } else {
     ThrowRDE("Can not detect bitdepth. StripByteCounts = %u, width = %u, "