Skip to content

Fix division by zero (NaN) in gmt_extend_region when +r/+e increment is 0 #9127

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

Open
Esteban82 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

Fix division by zero (NaN) in gmt_extend_region when +r/+e increment is 0 #9127

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
10 changes: 6 additions & 4 deletions src/gmt_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18677,10 +18677,12 @@ void gmt_extend_region (struct GMT_CTRL *GMT, double wesn[], unsigned int mode,
}
else { /* Make region be in multiples of increments, possibly with adjustment */
double adjust = (mode == GMT_REGION_ROUND_EXTEND) ? GMT_REGION_INCFACTOR : 0.0;
wesn[XLO] = floor ((wesn[XLO] - adjust * inc[XLO]) / inc[XLO]) * inc[XLO];
wesn[YLO] = floor ((wesn[YLO] - adjust * inc[YLO]) / inc[YLO]) * inc[YLO];
wesn[XHI] = ceil ((wesn[XHI] + adjust * inc[XHI]) / inc[XHI]) * inc[XHI];
wesn[YHI] = ceil ((wesn[YHI] + adjust * inc[YHI]) / inc[YHI]) * inc[YHI];
/* A zero increment on either axis means "leave that axis alone" - skip rounding
* for that axis instead of dividing by zero (which produced NaN, see issue #6434) */
if (inc[XLO] > 0.0) wesn[XLO] = floor ((wesn[XLO] - adjust * inc[XLO]) / inc[XLO]) * inc[XLO];
if (inc[YLO] > 0.0) wesn[YLO] = floor ((wesn[YLO] - adjust * inc[YLO]) / inc[YLO]) * inc[YLO];
if (inc[XHI] > 0.0) wesn[XHI] = ceil ((wesn[XHI] + adjust * inc[XHI]) / inc[XHI]) * inc[XHI];
if (inc[YHI] > 0.0) wesn[YHI] = ceil ((wesn[YHI] + adjust * inc[YHI]) / inc[YHI]) * inc[YHI];
}
}

Expand Down
Loading