Skip to content

Merge master changes into dev#3255

Merged
Lestropie merged 83 commits intodevfrom
master_to_dev
Jan 13, 2026
Merged

Merge master changes into dev#3255
Lestropie merged 83 commits intodevfrom
master_to_dev

Conversation

@Lestropie
Copy link
Member

@Lestropie Lestropie commented Jan 12, 2026

This merge is necessary in order for CI tests of PRs targeting dev to pass, given that the copyright update pushed to master in #3252 needs to be ported to dev also.

Duplicates fix in #3254.

  • Check set of PRs merged to master that are included here, and make sure that there are no fixes that have been discarded as part of the merge resolution process.

Lestropie and others added 30 commits March 14, 2023 11:59
The current DWI::Fixel_map<> class (to be deprecated in the future) contains at index 0 a fixel with an empty constructor. Any diagnosis information presented to the user should therefore be computed without consideration for this non-existing fixel.
Changes in 2be257c made as part of #3011 resulted in there being two separate attempts to construct an Image class from the same input header.
Fixes #3171.
MR::Axes::permutations_type: Fix is_identity()
fsl.check_first(): Handle run_first_all providing no HOLDID
Pipe image format: Revise error message
mrcalc: Docs: Combining mag&phase into complex data
mesh2voxel: Accept >3D image as template voxel grid
- unlock() must hold the mutex because it writes lockcentres[idx].second
- ~SpatialLock() should also lock before clearing lockcentres to avoid a race if another thread is concurrently in try_lock()/unlock().
This class holds a reference and relies on its destructor to call `unlock`. The default copy/move will copy idx and the reference leading to double unlock() calls.
ParticlePool::size() was a const accessor that read pool.size() and avail.size() without taking the pool mutex. Other threads can call create()/destroy() which modify pool/avail under the mutex.
tck2connectome: Add default assignment mechanism to docs
Use an unsigned integer 3D texture for the ROI (GL_R8UI) to store a
0/1 mask without normalization. Previously, we were using an integer
sampler with a GL_R8 texture leading to erraneous behaviour on MacOS. 
Any future code interacting with the ROI texture must avoid trying to 
enable filtering and use integer sampler to read from it.
Instead of using `glMultiDrawArrays`, which doesn't guarantee that draw 
calls will be executed in a batched fashion, we use `glDrawElements` 
with an index buffer. This fixes the performance issues seen on MacOS 
when visualising tractograms.

See https://programming4.us/multimedia/8302.aspx
Qt5 links to both OpenGL and AGL for OpenGL apps, but AGL is no longer included in MacOS Tahoe/Xcode26 (https://bugreports.qt.io/browse/QTBUG-137687). This will cause our configure script to fail on latest macOS. This issue will not be addressed in future Qt5 versions (only in Qt6), but we can work around it by explicitly linking only to OpenGL.
@Lestropie Lestropie self-assigned this Jan 12, 2026
@Lestropie Lestropie changed the title Merge mater changes into dev Merge master changes into dev Jan 12, 2026
@Lestropie
Copy link
Member Author

Lestropie commented Jan 12, 2026

  • Rectify tckglobal tests hanging on all platforms

Bug in manual merging of #3172 into #3255 via 34dfece.
Resolves new test in #3172 merged into #3255 with the change in test data filesystem structure introduced in #2235.
@Lestropie
Copy link
Member Author

clang-tidy Action immediately fails here due to the number of files with non-zero changes being too large. In future it may be preferable to do a master-to-dev merge of everything up to but not including the copyright update, so that all checks can be completed, and then do a second PR that is exclusively a merge of the copyright update.

Updates to both copyright years and fixed-tag documentation hyperlinks.
@Lestropie Lestropie merged commit 16d4148 into dev Jan 13, 2026
5 of 6 checks passed
@Lestropie Lestropie deleted the master_to_dev branch January 13, 2026 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants