Skip to content
Snippets Groups Projects
Commit 7ea740a3 authored by Matthew Webster's avatar Matthew Webster
Browse files

mergefix

parent bce01ef6
No related branches found
No related tags found
1 merge request!2mergefix
...@@ -177,11 +177,11 @@ void complexmerge(const string& fsource1, const string& fsource2, ...@@ -177,11 +177,11 @@ void complexmerge(const string& fsource1, const string& fsource2,
volume4D<float> vdr, vdi; volume4D<float> vdr, vdi;
for (int n=vr1.mint(); n<=vr1.maxt(); n++) { for (int n=vr1.mint(); n<=vr1.maxt(); n++) {
vdr.addvolume(vr1[n]); vdr.addvolume(vr1[n]);
vdr.addvolume(vi1[n]); vdi.addvolume(vi1[n]);
} }
for (int n=vr2.mint(); n<=vr2.maxt(); n++) { for (int n=vr2.mint(); n<=vr2.maxt(); n++) {
vdr.addvolume(vr2[n]); vdr.addvolume(vr2[n]);
vdr.addvolume(vi2[n]); vdi.addvolume(vi2[n]);
} }
vdr.copyproperties(vr1); vdr.copyproperties(vr1);
vdi.copyproperties(vr2); vdi.copyproperties(vr2);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment