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

Jump to bottom

Prevents indefinite loop when aperture is on 0. #874

Merged
merged 2 commits into from Mar 3, 2020
Merged

Prevents indefinite loop when aperture is on 0. #874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
debf614
Prevents indefinte loop when aperture is on 0.
Jan 22, 2020
9c5c3b8
Merge remote-tracking branch 'upstream/master' into fixInDefLoopApper…
Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mad_aper.c
View file
Open in desktop
Expand Up @@ -1149,7 +1149,7 @@ aper_calc(double p, double q, double* minhl,
if ( // not parallel lines
0 != aper_intersect(a1, b1, c1, a2, b2, c2, &xm, &ym)
// intersection point is inside the bounding box
&& ( xm < bbxmax && xm > bbxmin && ym < bbymax && ym > bbymin)
&& ( xm <= bbxmax && xm >= bbxmin && ym <= bbymax && ym >= bbymin)
// intersection point is inside pipe line segment
&& 0 != aper_on_line(xm, ym, pipex[i], pipey[i], pipex[i+1], pipey[i+1], dist_limit)
// halo center is not inside segement defined by halo apex and intersection point
Expand Down