Skip to content

Fix legend D without offset and G without argument #9280

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

Merged
Esteban82 merged 3 commits into from
Oct 28, 2026
Merged

Fix legend D without offset and G without argument #9280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7ff7dc
Fix legend D without offset and G without argument
Esteban82 Oct 27, 2026
9509f75
Merge branch 'master' into legend-fix-D-G
Esteban82 Oct 28, 2026
6abb639
Update ex41 baseline for the legend D fix
Esteban82 Oct 28, 2026
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
4 changes: 2 additions & 2 deletions doc/examples/images/ex41.ps.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
outs:
- md5: 57dae2c4622e72b2b4b3c64088cfa7d5
size: 1774717
- md5: bf5f7933c8807702d4ba387b34ab261f
size: 1753972
hash: md5
path: ex41.ps
13 changes: 10 additions & 3 deletions src/pslegend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,14 +717,18 @@ EXTERN_MSC int GMT_pslegend (void *V_API, int mode, void *args) {

case 'D': /* Delimiter record: D offset pen [-|=|+] */
txt_c[0] = '\0';
sscanf (&line[2], "%s %s %s", txt_a, txt_b, txt_c);
n = sscanf (&line[2], "%s %s %s", txt_a, txt_b, txt_c);
if (n == 2 && strchr ("-=+", txt_b[0])) strcpy (txt_c, txt_b); /* Offset was skipped: D pen flag */
if (!(txt_c[0] == '-' || txt_c[0] == '=')) height += quarter_line_spacing;
if (!(txt_c[0] == '+' || txt_c[0] == '=')) height += quarter_line_spacing;
column_number = 0;
break;

case 'G': /* Gap record */
sscanf (&line[2], "%s", txt_a);
if (strlen (line) < 3 || sscanf (&line[2], "%s", txt_a) != 1) {
GMT_Report (API, GMT_MSG_ERROR, "Not enough arguments given to G operator\n");
Return (GMT_RUNTIME_ERROR);
}
height += (txt_a[strlen(txt_a)-1] == 'l') ? atof (txt_a) * one_line_spacing : gmt_M_to_inch (GMT, txt_a);
column_number = 0;
break;
Expand Down Expand Up @@ -1239,7 +1243,10 @@ EXTERN_MSC int GMT_pslegend (void *V_API, int mode, void *args) {
break;

case 'G': /* Gap record: G gap (will be filled with current fill[0] setting if active) */
sscanf (&line[2], "%s", txt_a);
if (strlen (line) < 3 || sscanf (&line[2], "%s", txt_a) != 1) {
GMT_Report (API, GMT_MSG_ERROR, "Not enough arguments given to G operator\n");
Return (GMT_RUNTIME_ERROR);
}
row_height = (txt_a[strlen(txt_a)-1] == 'l') ? atof (txt_a) * one_line_spacing : gmt_M_to_inch (GMT, txt_a);
pslegend_fillcell (GMT, Ctrl->D.refpoint->x, row_base_y-row_height, row_base_y+gap, x_off_col, &d_line_after_gap, n_columns, fill);
row_base_y -= row_height;
Expand Down
Loading