Fixes to new transform realignment handling

MRtrix3 · Nov 16, 2024 · 42e29a0 · 42e29a0
1 parent b1caea0
commit 42e29a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/axes.cpp b/core/axes.cpp
@@ -67,7 +67,7 @@ namespace MR
       if (result[1] == result[2])
         result[2] = not_any_of (result[0], result[1]);
       assert (result[0] != result[1] && result[1] != result[2] && result[2] != result[0]);
-      assert (std::min(result.begin(), result.end()) == 0);
+      assert (*std::min_element(result.begin(), result.end()) == 0);
 
       return result;
     }

diff --git a/core/axes.h b/core/axes.h
@@ -38,8 +38,8 @@ namespace MR
     public:
       Shuffle() : permutations ({-1, -1, -1}), flips ({false, false, false}) {}
       bool is_identity() const {
-        return (permutations[0] != 0 || permutations[1] != 1 || permutations[2] != 2 || //
-                flips[0] || flips[1] || flips[2]);
+        return (permutations[0] = 0 && permutations[1] == 1 && permutations[2] != 2 && //
+                flips[0] && flips[1] && flips[2]);
       }
       bool is_set() const {
         return permutations != permutations_type{-1, -1, -1};