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

movie: Fix the bug that the gmt.conf file in the main script is not read correctly #8436

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

movie: Fix the bug that the gmt.conf file in the main script is not read correctly #8436

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
8 changes: 4 additions & 4 deletions src/movie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@ static int parse (struct GMT_CTRL *GMT, struct MOVIE_CTRL *Ctrl, struct GMT_OPTI
n_errors += gmt_M_repeated_module_option (API, Ctrl->M.active);
if ((c = gmt_first_modifier (GMT, opt->arg, "rv"))) { /* Process any modifiers */
pos = 0; /* Reset to start of new word */
while (gmt_getmodopt (GMT, 'M', c, "rv", &pos, p, &n_errors) && n_errors == 0) {
while (gmt_getmodopt (GMT, 'M', c, "rv", &pos, p, &n_errors) && n_errors == 0) {
switch (p[0]) {
case 'r': /* Gave specific resolution for master frame */
Ctrl->M.dpu = atof (&p[2]);
Expand All @@ -1085,7 +1085,7 @@ static int parse (struct GMT_CTRL *GMT, struct MOVIE_CTRL *Ctrl, struct GMT_OPTI
default:
break; /* These are caught in gmt_getmodopt so break is just for Coverity */
}
}
}
c[0] = '\0'; /* Chop off modifiers so we just have -M[<frame>|f|l|m][,format] */
}
if ((s = strchr (opt->arg, ',')) ) { /* Gave both frame and format */
Expand Down Expand Up @@ -1251,7 +1251,7 @@ static int parse (struct GMT_CTRL *GMT, struct MOVIE_CTRL *Ctrl, struct GMT_OPTI
n_errors += gmt_M_check_condition (GMT, Ctrl->H.active && Ctrl->H.factor < 2, "Option -H: factor must be and integer > 1\n");
//n_errors += gmt_M_check_condition (GMT, Ctrl->A.active && !Ctrl->F.active[MOVIE_MP4] && !Ctrl->F.active[MOVIE_WEBM], "Option -A: Audio is only valid with -Fmp4 or -Fwebm\n");


if (!Ctrl->T.split) { /* Make sure we split text if we request word columns in the labeling */
unsigned int n_used = 0;
for (k = MOVIE_ITEM_IS_LABEL; k <= MOVIE_ITEM_IS_PROG_INDICATOR; k++)
Expand Down Expand Up @@ -1729,8 +1729,8 @@ EXTERN_MSC int GMT_movie (void *V_API, int mode, void *args) {
fprintf (fp, "%s %s\n", load[Ctrl->In.mode], init_file); /* Include the initialization parameters */
while (gmt_fgets (GMT, line, PATH_MAX, Ctrl->S[MOVIE_PREFLIGHT].fp)) { /* Read the background script and copy to preflight script with some exceptions */
if (gmt_is_gmtmodule (line, "begin")) { /* Need to insert gmt figure after this line (or as first line) in case a background plot will be made */
fprintf (fp, "gmt begin\n"); /* To ensure there are no args here since we are using gmt figure instead */
if (has_conf && !strstr (line, "-C")) fprintf (fp, cpconf[Ctrl->In.mode], conf_file);
fprintf (fp, "gmt begin\n"); /* To ensure there are no args here since we are using gmt figure instead */
gmt_set_comment (fp, Ctrl->In.mode, "\tSet fixed background output ps name");
fprintf (fp, "\tgmt figure movie_background ps\n");
fprintf (fp, "\tgmt set PS_MEDIA %g%cx%g%c\n", Ctrl->C.dim[GMT_X], Ctrl->C.unit, Ctrl->C.dim[GMT_Y], Ctrl->C.unit);
Expand Down
Loading