Regular merge of master hotfixes to dev #2673
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrview: change option name -orientationlabel to avoid conflict with -orientation
…t with -orientation" This reverts PR #2569
…nlabel_option Revert "mrview: change option name -orientationlabel to avoid conflict with -orientation"
The plan is to make use of GitHub's new merge queue feature, to reduce the faff when trying to merge multiple pull requests at the same time. More detail on the GitHub docs: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue Note that this has been activated on master.
Update GitHub Actions workflow for merge queue
- Change binary export to single-precision floating-point. - Change binary export to big-endian. - Support import of both little-endian and big-endian data. Closes #2593.
Add file ".git-blame-ignore-revs"
Commit e4b3530 was supposed to include this change, but while write was made independent of the width of default_type, it was erroneously hard-wired to double-precision rather than single.
VTK surface format changes
App::get_matches(): Fix buffer overrun
Mesh::load_vtk() always open files in binary mode
mrview: fix tsf custom colour
tcksift2: Fix check for allocation of memory for weights vector
Conflicts: src/gui/mrview/tool/tractography/track_scalar_file.h src/surface/mesh.cpp testing/binaries/data
|
@MRtrix3/mrtrix3-devs Anyone help with the mac CI failure? |
|
I think it was just a backend issue with homebrew, I reran the test and I think it should pass now. |
|
I think the same thing happened with an earlier PR we merged recently. Re-running the job seemed to work ok then, not sure why it failed the first time... |
|
It's probably this Homebrew/homebrew-core#135315 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Triggered in particular to grab file
.git-blame-ignore-revsadded in #2592 to be used in #2652.Some minor conflicts arising from:
masterand removal ofMEMALIGNin Support qt6 #2297 ondev(Also doing cleanup of branches over there to have branch tips reflect pointers on this repository and delete branches corresponding to merged PRs)