You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
without calling gmt_begin() again. This is need in externals that want to keep using the API
16664
16664
contents between diferent module calls.
16665
16665
*/
16666
-
/* Reset default input column order */
16667
-
for (i = 0; i < GMT_MAX_COLUMNS; i++)
16668
-
GMT->current.io.col[GMT_IN][i].col = GMT->current.io.col[GMT_IN][i].order = i; /* Default order */
16669
-
for (i = 0; i < GMT_MAX_COLUMNS; i++) GMT->current.io.col_skip[i] = false; /* Consider all input columns */
16670
-
/* Reset default output column order */
16671
-
for (i = 0; i < GMT_MAX_COLUMNS; i++)
16672
-
GMT->current.io.col[GMT_OUT][i].col = GMT->current.io.col[GMT_OUT][i].order = i; /* Default order */
16666
+
/* Reset default input column order, but not too soon (#8620) */
16667
+
if (func_level_bak <= GMT_TOP_MODULE) {
16668
+
for (i = 0; i < GMT_MAX_COLUMNS; i++)
16669
+
GMT->current.io.col[GMT_IN][i].col = GMT->current.io.col[GMT_IN][i].order = i; /* Default order */
16670
+
for (i = 0; i < GMT_MAX_COLUMNS; i++) GMT->current.io.col_skip[i] = false; /* Consider all input columns */
16671
+
/* Reset default output column order */
16672
+
for (i = 0; i < GMT_MAX_COLUMNS; i++)
16673
+
GMT->current.io.col[GMT_OUT][i].col = GMT->current.io.col[GMT_OUT][i].order = i; /* Default order */
16674
+
}
16673
16675
16674
16676
for (i = 0; i < 2; i++) GMT->current.io.skip_if_NaN[i] = true; /* x/y must be non-NaN */
16675
16677
if (GMT->hidden.func_level == 0) /* Only when top-level module ends. Doesn't affect CLI but useful for externals */
16676
-
for (i = 0; i < 2; i++) gmt_set_column_type(GMT, GMT_IO, i, GMT_IS_UNKNOWN); /* Must be told [or find out] what x/y are */
16677
-
for (i = 2; i < GMT_MAX_COLUMNS; i++) gmt_set_column_type(GMT, GMT_IO, i, GMT_IS_FLOAT); /* Other columns default to floats */
16678
-
gmt_M_memset(GMT->current.io.col_set[GMT_X], GMT_MAX_COLUMNS, char); /* This is the initial state of input columns - all available to be changed by modules */
16679
-
gmt_M_memset(GMT->current.io.col_set[GMT_Y], GMT_MAX_COLUMNS, char); /* This is the initial state of output columns - all available to be changed by modules */
16680
-
gmt_M_memset(GMT->current.io.curr_rec, GMT_MAX_COLUMNS, double); /* Initialize current and previous records to zero */
for (i = 0; i < 2; i++) gmt_set_column_type(GMT, GMT_IO, i, GMT_IS_UNKNOWN); /* Must be told [or find out] what x/y are */
16679
+
for (i = 2; i < GMT_MAX_COLUMNS; i++) gmt_set_column_type(GMT, GMT_IO, i, GMT_IS_FLOAT); /* Other columns default to floats */
16680
+
gmt_M_memset(GMT->current.io.col_set[GMT_X], GMT_MAX_COLUMNS, char); /* This is the initial state of input columns - all available to be changed by modules */
16681
+
gmt_M_memset(GMT->current.io.col_set[GMT_Y], GMT_MAX_COLUMNS, char); /* This is the initial state of output columns - all available to be changed by modules */
16682
+
gmt_M_memset(GMT->current.io.curr_rec, GMT_MAX_COLUMNS, double); /* Initialize current and previous records to zero */
0 commit comments