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.

Sign up for GitHub

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

COMP: Remove conflict marker #5

Open
wants to merge 1 commit into
base: fastashs
Choose a base branch
from
Open

COMP: Remove conflict marker #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,7 @@ WeightedVotingLabelFusionImageFilter<TInputImage, TOutputImage>
apd[i] = new InputImagePixelType[nPatch];

// Also an array of pointers to the segmentations of different atlases
const InputImagePixelType **patchSeg = new const InputImagePixelType*[n];
>>>>>>> 515ff7c2f50928adabc4e64bded9a7e76fc750b1
const InputImagePixelType **patchSeg = new const InputImagePixelType*[n];

// Create a counter map -- needed if we have weights or posteriors - so always
m_CounterMap = PosteriorImage::New();
Expand Down