-
-
Notifications
You must be signed in to change notification settings - Fork 332
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.
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
r.carve: adding the option to read width, depth values from vector map table columns #803
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo
2793af8
to
1cb8d75
Compare
I have merged current main into this which refreshes the code base in the PR overall. The PR had some indentation changes included, so the new indented code from main should actually make this PR cleaner. Anyway, no conflicts with the main branch now. |
Thanks! |
Merged this to main again. |
There is a mac CI failure:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Docs in general need to be corrected, for a start, if not urgent fix perhaps milestone bump to 8.4 perhaps preferable.
} | ||
|
||
void set_value(dbColumn *col, unsigned short int *ctype, char *answer, | ||
double *parm, double *def_value, dbTable *table, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
table
not used
set_value(depth_col, &depth_col_type, parm->depth_col->answer, | ||
&parm->sdepth, def_depth, table, &wind, DEPTH); | ||
|
||
for (c = 0; c < sql.ncats; c++) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
”comparison of integers of different signs: 'unsigned int' and 'int' `[-Werror,-Wsign-compare]” compiler warning
struct field_info *Fi, int *width_col_pos, | ||
int *depth_col_pos, char *columns[2], dbDriver *driver) | ||
/* | ||
* Function: enforce_downstream |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Docs before function, see doxygen style, eg.
Line 30 in 001bf57
/*! |
The CI gcc tests show this error:
|
Adding the option to read width, depth values from vector map table columns issue #686.