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

Check that sphdistance -Q is given a file #7619

Merged
merged 2 commits into from Jul 7, 2023
Merged

Check that sphdistance -Q is given a file #7619

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bca801b
Check that sphdistance -Q is given a file
PaulWessel Jul 7, 2023
fbaebd1
Merge branch 'master' into sph-Q-file
PaulWessel Jul 7, 2023
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
3 changes: 2 additions & 1 deletion src/sphdistance.c
View file
Open in desktop
Expand Up @@ -240,7 +240,7 @@ static int parse (struct GMT_CTRL *GMT, struct SPHDISTANCE_CTRL *Ctrl, struct GM
break;
case 'Q':
n_errors += gmt_M_repeated_module_option (API, Ctrl->Q.active);
Ctrl->Q.file = strdup (opt->arg);
n_errors += gmt_get_required_file (GMT, opt->arg, opt->option, 0, GMT_IS_DATASET, GMT_IN, GMT_FILE_REMOTE, &(Ctrl->Q.file));
break;
default: /* Report bad options */
n_errors += gmt_default_option_error (GMT, opt);
Expand All @@ -252,6 +252,7 @@ static int parse (struct GMT_CTRL *GMT, struct SPHDISTANCE_CTRL *Ctrl, struct GM
n_errors += gmt_M_check_condition (GMT, GMT->common.b.active[GMT_IN] && GMT->common.b.ncol[GMT_IN] < 3, "Binary input data (-bi) must have at least 3 columns\n");
n_errors += gmt_M_check_condition (GMT, GMT->common.R.inc[GMT_X] <= 0.0 || GMT->common.R.inc[GMT_Y] <= 0.0, "Option -I: Must specify positive increment(s)\n");
n_errors += gmt_M_check_condition (GMT, Ctrl->Q.active && GMT->common.b.active[GMT_IN] && !Ctrl->N.active, "Binary input data (-bi) with -Q also requires -N.\n");
n_errors += gmt_M_check_condition (GMT, Ctrl->Q.active && GMT->common.b.active[GMT_IN] && !Ctrl->N.active, "Binary input data (-bi) with -Q also requires -N.\n");
n_errors += gmt_M_check_condition (GMT, !Ctrl->G.file, "Option -G: Must specify output file\n");

return (n_errors ? GMT_PARSE_ERROR : GMT_NOERROR);
Expand Down