search

pyushkevich / ashs

Automatic Segmentation of Hippocampal Subfields
http://www.nitrc.org/projects/ashs
GNU General Public License v3.0
15 stars 5 forks source link

Conflicted files committed to fastashs branch #4

Open cookpa opened 2 years ago

cookpa commented 2 years ago

I'm trying to build from source, and found these

https://github.com/pyushkevich/ashs/blob/7eaead92427acd4f56a083cecfd9761a5efc4e8f/src/LabelFusion/WeightedVotingLabelFusionImageFilter.h#L220-L225

There's also conflicts in WeightedVotingLabelFusionImageFilter.txx. I'm not sure how to resolve

pyushkevich commented 2 years ago

Try now, Phil - it should compile

Thanks!

On Wed, Jun 15, 2022 at 9:17 AM Philip Cook @.***> wrote:

I'm trying to build from source, and found these

https://github.com/pyushkevich/ashs/blob/7eaead92427acd4f56a083cecfd9761a5efc4e8f/src/LabelFusion/WeightedVotingLabelFusionImageFilter.h#L220-L225

There's also conflicts in WeightedVotingLabelFusionImageFilter.txx. I'm not sure how to resolve

— Reply to this email directly, view it on GitHub https://github.com/pyushkevich/ashs/issues/4, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAJPEW3HNR3WQOG6QQNP54LVPHJU7ANCNFSM5Y3IVUDQ . You are receiving this because you are subscribed to this thread.Message ID: @.***>

cookpa commented 2 years ago

Looks like there's one left over

https://github.com/pyushkevich/ashs/blob/b113c6018a588d55f0c24a42a930a00b63db4a92/src/LabelFusion/WeightedVotingLabelFusionImageFilter.txx#L271