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

Make sure create_table sets allocation mode #5953

Merged
merged 13 commits into from
Nov 9, 2021
Merged

Make sure create_table sets allocation mode #5953

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6c06e2
Make sure create_table sets allocation mode
PaulWessel Nov 5, 2021
b66d6be
Update gmt_io.c
PaulWessel Nov 5, 2021
2eccacd
Improve alloc_levels etc
PaulWessel Nov 6, 2021
994b473
A few fixes
PaulWessel Nov 6, 2021
67df263
Merge branch 'master' into table-alloc-mode
PaulWessel Nov 8, 2021
56ccf6b
Merge branch 'master' into table-alloc-mode
PaulWessel Nov 8, 2021
10f666e
Merge branch 'master' into table-alloc-mode
PaulWessel Nov 8, 2021
624cf8b
Merge branch 'master' into table-alloc-mode
PaulWessel Nov 8, 2021
f2cac77
Track allocation mode per column
PaulWessel Nov 8, 2021
b9577be
Update gmt_io.c
PaulWessel Nov 8, 2021
3095c53
Update grdview.c
PaulWessel Nov 9, 2021
eeae32b
Update grdview.c
PaulWessel Nov 9, 2021
4922411
Cleaner freeing
PaulWessel Nov 9, 2021
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
2 changes: 2 additions & 0 deletions src/gmt_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3203,6 +3203,7 @@ GMT_LOCAL struct GMT_DATATABLE *gmtio_alloc_table (struct GMT_CTRL *GMT, struct
T->n_records += nr;
if (Tin->segment[seg]->label) T->segment[seg]->label = strdup (Tin->segment[seg]->label);
}
TH->alloc_mode = GMT_ALLOC_INTERNALLY;
return (T);
}

Expand Down Expand Up @@ -7795,6 +7796,7 @@ struct GMT_DATATABLE * gmt_create_table (struct GMT_CTRL *GMT, uint64_t n_segmen
if (alloc_only) T->segment[seg]->n_rows = 0;
}
}
TH->alloc_mode = GMT_ALLOC_INTERNALLY;

return (T);
}
Expand Down