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

sfmMerge can merge Intrinsics #1815

Merged
merged 1 commit into from
Jan 28, 2025
Merged

sfmMerge can merge Intrinsics #1815

merged 1 commit into from
Jan 28, 2025

Conversation

servantftechnicolor
Copy link
Contributor

When merging, if the same intrinsic id exists in two sfmData, only throw an error if the intrinsics parameters are different


if (!(obj1 == obj2))
{
ALICEVISION_LOG_ERROR("Unhandled error: common intrinsic ID with different parameters between both SfMData");
Copy link
Member

@fabiencastan fabiencastan Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for RIG, do not return directly if common rigs, few lines below.

@fabiencastan fabiencastan added this to the 3.3.0 milestone Jan 28, 2025
Copy link
Member

@fabiencastan fabiencastan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works, need to do the same for the rigs.

@fabiencastan fabiencastan merged commit fa44c99 into develop Jan 28, 2025
5 checks passed
@fabiencastan fabiencastan deleted the dev/betterMerge branch January 28, 2025 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants