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

Fix IBA::fillholes_pushpull when display window != data window #1768

Merged
merged 1 commit into from
Sep 15, 2017

Conversation

lgritz
Copy link
Collaborator

@lgritz lgritz commented Sep 15, 2017

We pasted the result into the dest to be aligned with the dst's data
origin, instead of the correct source origin. So for cropped, overscanned,
or shrink-wrapped images, it would botch the origin.

While I was there, I slightly simplified the error checking by using
existing IBAPrep functionality to check for the same edge cases.

We pasted the result into the dest to be aligned with the dst's data
origin, instead of the correct source origin.

While I was there, I slightly simplified the error checking by using
existing IBAPrep functionality to check for the same edge cases.
@@ -1098,7 +1084,7 @@ ImageBufAlgo::fillholes_pushpull (ImageBuf &dst, const ImageBuf &src,

// Now copy the completed base layer of the pyramid back to the
// original requested output.
paste (dst, dstspec.x, dstspec.y, dstspec.z, 0, *pyramid[0]);
paste (dst, src.spec().x, src.spec().y, src.spec().z, 0, *pyramid[0]);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This line is the actual bug fix. The rest is just cleanup, testing, and docs clarification.

@fpsunflower
Copy link
Contributor

LGTM!

@lgritz lgritz merged commit 9eb6a02 into AcademySoftwareFoundation:master Sep 15, 2017
@lgritz lgritz deleted the lg-fillholes branch September 15, 2017 19:20
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.

None yet

2 participants