3.0.1 update dev -> master #2115
Merged
Conversation
This file contains hidden or 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
Android fixes
Changes necessary for upcoming copyright notice changes to work.
Script ensures conformity of copyright information in source file headers.
Warning regarding comparison between signed and unsigned integers on some compilers under Eigen 3.2.
Math::Zstatistic: Fix compiler warning
Copyright
mtnormalise: warn if only one contrast provided
In cases where both cuda and openmp versions of eddy are available, the reason for the cuda version failing may be obscured because it is only the terminal output produced by the openmp version that is reported to the user. With this change, the messages produced by both cuda and openmp eddy commands will be concatenated into a new combined exception.
dwifslpreproc: eddy error message
Conflicts: src/gui/mrview/sync/enums.h
Merge latest master changes into dev
In order to support images with axis sizes greater than 2^31, a version of the parse_ints() function operating with 64-bit integers is required. This change turns this function into a template, and updates all usages accordingly. Note also that many usages of this function involve values that must be non-negative; for such instances the data handling is changed to unsigned integer type, and an Exception should be thrown during the string-to-unsigned-integer conversion, rather than relying on downstream data sanity checking.
Comparisons between signed and unsigned integers present in 5909980.
Update unit test to reflect 5909980.
Changing to unsigned integers in 5909980 exposed fragility in the prior implementation of move_index() for this adapter.
Support images with axis size greater than 2^31
Docs: Move fixel format to dedicated page in FBA
jdtournier
previously approved these changes
Jul 1, 2020
jdtournier
approved these changes
Jul 1, 2020
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.
Given that the
devbranch does not currently contain any major feature updates, just non-critical fixes, I think it makes sense to incorporate all of those changes into the3.0.1tag in addition to those hotfixes that have been merged directly tomastersince3.0.0.