Merge branch 'master' into psconvert-no-file-dup

GenericMappingTools · Jan 3, 2025 · ed88283 · ed88283
2 parents 30a0941 + 79800bd
commit ed88283
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/doc/rst/source/devdocs/contributing.rst b/doc/rst/source/devdocs/contributing.rst
@@ -440,7 +440,7 @@ using the following steps:
 - Run ``dvc diff`` to check that modified files are in the correct directory.
 - Add the modified images to dvc using ``dvc add test/baseline/<module>/<newplot.ps>``, ``dvc add doc/scripts/images/<newplot.ps>``,
   or ``dvc add doc/examples/images/<newplot.ps>``
-  depending on the type of test modified. RUn one dvc add command per updated PostScript plot.
+  depending on the type of test modified. Run one dvc add command per updated PostScript plot.
 - Check that the .dvc file was updated by running ``git status``.
 - Stage the modified .dvc files in git using ``git add test/baseline/<module>/<newplot.ps>.dvc``, ``git add doc/scripts/images/<newplot.ps>.dvc``,
   or ``git add doc/examples/images/<newplot.ps>.dvc``, again per updated file.

diff --git a/src/gmt_init.c b/src/gmt_init.c
@@ -1168,9 +1168,9 @@ GMT_LOCAL void gmtinit_translate_to_short_options(struct GMTAPI_CTRL *API, struc
 	   and also note that at this point we will always be at GMT_MSG_WARNING or whatever
 	   default verbosity level the program is initialized with -- fix this later (or not)! */
 #endif /* 0 */
-	if (modified) {
+	if (modified && gmt_M_is_verbose (API->GMT, GMT_MSG_INFORMATION)) {	/* Echo the converted options */
 		char *cmd = GMT_Create_Cmd (API, *options);
-		GMT_Report (API, GMT_MSG_WARNING, "Reformatted options: %s\n", cmd);
+		GMT_Report (API, GMT_MSG_INFORMATION, "Reformatted options: %s\n", cmd);
 		GMT_Destroy_Cmd (API, &cmd);	/* Free string */
 	}
 }

diff --git a/src/grdedit.c b/src/grdedit.c
@@ -595,7 +595,7 @@ EXTERN_MSC int GMT_grdedit (void *V_API, int mode, void *args) {
 		if (Ctrl->A.active) {
 			G->header->inc[GMT_X] = gmt_M_get_inc (GMT, G->header->wesn[XLO], G->header->wesn[XHI], G->header->n_columns, G->header->registration);
 			G->header->inc[GMT_Y] = gmt_M_get_inc (GMT, G->header->wesn[YLO], G->header->wesn[YHI], G->header->n_rows, G->header->registration);
-			GMT_Report (API, GMT_MSG_INFORMATION, "Reset grid-spacing in file %s to %g/%g\n",
+			GMT_Report (API, GMT_MSG_INFORMATION, "Reset grid-spacing in file %s to %.14g/%.14g\n",
 				out_file, G->header->inc[GMT_X], G->header->inc[GMT_Y]);
 		}
 		if (gmt_M_is_geographic (GMT, GMT_IN) && gmt_M_is_cartesian (GMT, GMT_OUT)) {	/* Force a switch from geographic to Cartesian */