Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Safer C++ DataContainer data type handling updated #1210

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4dfdcba
implemented safer C++ data type handling, fixes #1193
evgueni-ovtchinnikov May 26, 2023
13aaccb
corrected errors reported by GHA
evgueni-ovtchinnikov May 29, 2023
f1e2fce
fixed SIRF build, some SYN/REG tests fail (segfault)
evgueni-ovtchinnikov May 30, 2023
269d3e4
Merge branch 'data-cont-templ' of https://github.com/SyneRBI/SIRF int…
evgueni-ovtchinnikov May 30, 2023
ec91ed2
fixed synergistic tests except GadgetronImageData reorient
evgueni-ovtchinnikov May 31, 2023
e6965be
fixed GadgetronImageData reorient test
evgueni-ovtchinnikov Jun 1, 2023
d7fce84
fixed silly bug in cSIRF_ImageData_get_geom_info, all tests passed on VM
evgueni-ovtchinnikov Jun 2, 2023
dbacfba
attended to KT and Codacy suggestions
evgueni-ovtchinnikov Jun 5, 2023
202208c
removed OldDataContainer from DataContainer.h
evgueni-ovtchinnikov Jun 6, 2023
ff37f01
removed commented-out lines from NiftiImageData.cpp
evgueni-ovtchinnikov Jun 6, 2023
fc43c3c
tried KT suggestion of tidyig up by typedef'ing self_type
evgueni-ovtchinnikov Jun 7, 2023
de02afa
[ci skip] removed commented out debug prints from NiftyResampler.cpp
evgueni-ovtchinnikov Jun 8, 2023
71ed1a2
trying alternative design of MRAcquisitionData::binary_op
evgueni-ovtchinnikov Jun 8, 2023
ce5a895
removed casts made obsolete by the new design of binary_op
evgueni-ovtchinnikov Jun 8, 2023
305a32d
moved binary algebra (except power) up to DataContainerTempl
evgueni-ovtchinnikov Jun 14, 2023
e15e5c1
moved up semibinary algebra (except power) to DataContainerTempl
evgueni-ovtchinnikov Jun 14, 2023
ba79aea
moved up method power to DataContainerTempl
evgueni-ovtchinnikov Jun 15, 2023
36b6461
moved up unary functions to DataContainerTempl
evgueni-ovtchinnikov Jun 15, 2023
5ac7330
commented out unused ISMRMRD::Acquisition algebra [ci skip]
evgueni-ovtchinnikov Jun 15, 2023
34cf48f
removed commented-out lines [ci skip]
evgueni-ovtchinnikov Jun 15, 2023
4ac685b
implemented semibinary algebra in DataContainerTempl without void poi…
evgueni-ovtchinnikov Jun 15, 2023
e237919
eliminated DataContainerTempl methods with void* arguments
evgueni-ovtchinnikov Jun 15, 2023
47f27cf
eliminated all usage of void* in DataContainers' arguments
evgueni-ovtchinnikov Jun 15, 2023
8f3431c
deleted commented-out lines [ci skip]
evgueni-ovtchinnikov Jun 16, 2023
101e5f0
merged master, resolved conflicts
evgueni-ovtchinnikov Aug 23, 2023
635ee09
added resampler norm stuff
evgueni-ovtchinnikov Aug 24, 2023
0cbfe11
adopted small amendments suggested in the review
evgueni-ovtchinnikov Aug 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Registration/cReg/NiftiBasedRegistration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ limitations under the License.
using namespace sirf;

template<class dataType>
void NiftiBasedRegistration<dataType>::convert_to_NiftiImageData_if_not_already(std::shared_ptr<const NiftiImageData3D<dataType> > &output_sptr, const std::shared_ptr<const ImageData> &input_sptr)
void NiftiBasedRegistration<dataType>::convert_to_NiftiImageData_if_not_already(std::shared_ptr<const NiftiImageData3D<dataType> > &output_sptr, const std::shared_ptr<const ImageData<dataType> > &input_sptr)
{
// Try to dynamic cast from ImageData to (const) NiftiImageData. This will only succeed if original type was NiftiImageData
output_sptr = std::dynamic_pointer_cast<const NiftiImageData3D<dataType> >(input_sptr);
Expand Down
Loading
Loading