Merge branch 'master' of https://github.com/GenericMappingTools/gmt

joa-quim · joa-quim · commit 749297bd88c8 · 2025-12-24T17:11:15.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout the repository
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v6.0.0
 
     - name: Link Checker
       id: lychee
diff --git a/.github/workflows/ci-caches.yml b/.github/workflows/ci-caches.yml
@@ -116,7 +116,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Download GSHHG and DCW datasets
         run: bash ci/download-coastlines.sh
@@ -135,7 +135,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Install vcpkg libraries
         run: bash ci/install-dependencies-windows.sh
diff --git a/.github/workflows/code-validator.yml b/.github/workflows/code-validator.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Check PSL_strings.h
         run: |
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -88,7 +88,7 @@ jobs:
           fi
 
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       # Fix the git error:
       # "failed to run git: fatal: detected dubious ownership in repository at '/__w/gmt/gmt'"
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/
@@ -138,7 +138,7 @@ jobs:
           echo "${INSTALLDIR}/bin" >> $GITHUB_PATH
 
       - name: Checkout the gh-pages branch in a separate folder
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
         with:
           ref: gh-pages
           # Checkout to this folder instead of the current one
diff --git a/.github/workflows/dvc-diff.yml b/.github/workflows/dvc-diff.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v6.0.0
 
     - name: Setup data version control (DVC)
       uses: iterative/setup-dvc@v2
diff --git a/.github/workflows/lint-checker.yml b/.github/workflows/lint-checker.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Check out repository
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v6.0.0
 
     - name: Install cppcheck
       run: |
diff --git a/.github/workflows/release-baseline-images.yml b/.github/workflows/release-baseline-images.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v6.0.0
 
     - name: Setup data version control (DVC)
       uses: iterative/setup-dvc@v2
diff --git a/.github/workflows/remind.yml b/.github/workflows/remind.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v5.0.0
+      uses: actions/checkout@v6.0.0
 
     - name: Find and report known failures
       run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -60,7 +60,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@v6.0.0
 
       - name: Setup vcpkg (Windows)
         run: gh run download -n vcpkg-cache -D C:/vcpkg/installed/
diff --git a/doc/examples/ex08/ex08.bat b/doc/examples/ex08/ex08.bat
@@ -6,6 +6,6 @@ REM DOS calls:	echo
 REM
 gmt begin ex08
 	gmt makecpt -Ccubhelix -T-5000/0
-	gmt grd2xyz @earth_relief_05m -R0/5/0/5 | gmt plot3d -B -Bz1000+l"Topography (m)" -BWSneZ+b+tETOPO5 -R0/5/0/5/-5000/0 -JM12c -JZ14c -p200/30 -So0.0833333ub-5000 -Wthinnest -C -i0:2,2
+	gmt grd2xyz @earth_relief_05m -R0/5/0/5 | gmt plot3d -B -Bz1000+l"Topography (m)" -BWSneZ+b+tETOPO5 -R0/5/0/5/-5000/0 -JM12c -JZ14c -p200/30 -So0.0833333u+b-5000 -Wthinnest -C -i0:2,2
 	echo 0.1 4.9 This is the surface of cube | gmt text -JZ -Z0 -F+f24p,Helvetica-Bold+jTL -p
 gmt end show
diff --git a/doc/examples/ex08/ex08.sh b/doc/examples/ex08/ex08.sh
@@ -8,6 +8,6 @@
 gmt begin ex08
 	gmt makecpt -Ccubhelix -T-5000/0
 	gmt grd2xyz @earth_relief_05m -R0/5/0/5 | gmt plot3d -B -Bz1000+l"Topography (m)" -BWSneZ+b+tETOPO5 \
-		-R0/5/0/5/-5000/0 -JM12c -JZ14c -p200/30 -So0.0833333ub-5000 -Wthinnest -C -i0:2,2
+		-R0/5/0/5/-5000/0 -JM12c -JZ14c -p200/30 -So0.0833333u+b-5000 -Wthinnest -C -i0:2,2
 	echo '0.1 4.9 This is the surface of cube' | gmt text -JZ -Z0 -F+f24p,Helvetica-Bold+jTL -p
 gmt end show
diff --git a/doc/rst/source/coast.rst b/doc/rst/source/coast.rst
@@ -295,9 +295,9 @@ Optional Arguments
 .. _-g:
 
 **-gD**\ *dist*
-    Short version of the global **-g** option. Here it is used to set the _dist_ distance, in map units,
-		higher then which we consider to have a gap. Useful for the Spilhaus projection (though we automatically set it)
-		and when line wrapping on dateline was not correctly detected. As an example of this, see for instance
+    Short version of the global **-g** option. Here it is used to set the *dist* distance, in map units,
+    higher than which we consider to have a gap. Useful for the Spilhaus projection (though we automatically set it)
+    and when line wrapping on dateline was not correctly detected. As an example of this, see for instance
     the old issue `#3667 <https://github.com/GenericMappingTools/gmt/issues/3667>`_ that can be fixed
     by adding **-gD**\ 1 to the command line.
 
diff --git a/doc/rst/source/explain_symbols.rst_ b/doc/rst/source/explain_symbols.rst_
@@ -269,6 +269,7 @@
         There are three classes of vectors: Cartesian (left), circular (center) and geographic (right).
         While their use is slightly different, they all share common modifiers that affect how
         they are displayed.
+        See also :ref:`Technical reference - Drawing of Vectors<reference/features:The Drawing of Vectors>`.
 
     **-Sm**\ *size*\ [**+**\ *vecmodifiers*]
         **m**\ ath angle arc, optionally with one or two arrow heads [Default is
diff --git a/doc/rst/source/plot.rst b/doc/rst/source/plot.rst
@@ -323,6 +323,7 @@ Optional Arguments
       **b** (beginning) or **e** (end) to add a vector at only one end [Default is shared specs for both end of the line].
       **Note** - Because **+v** may take additional modifiers it must necessarily be given
       at the end of the pen specification. See the `Vector Attributes`_ for more information or such modifiers.
+      See also :ref:`Technical reference - Drawing of Vectors<reference/features:The Drawing of Vectors>`
     - **+z** - If |-Z| is set, assign pen color via **-C**\ *cpt* and the *z*-values obtained
       (same if transparency is set via |-Z|).  Finally, if pen *color* = *auto*\ [*-segment*] or *auto-table* then
       we will cycle through the pen colors implied by :term:`COLOR_SET` and change on a per-segment
diff --git a/doc/rst/source/psconvert.rst b/doc/rst/source/psconvert.rst
@@ -26,7 +26,7 @@ Synopsis
 [ |-N|\ [**+f**\ *fade*][**+g**\ *background*][**+k**\ *fadecolor*][**+p**\ [*pen*]] ]
 [ |-Q|\ [**g**\|\ **p**\|\ **t**][1\|2\|4] ]
 [ |-S| ]
-[ |-T|\ **b**\|\ **e**\|\ **E**\|\ **f**\|\ **F**\|\ **j**\|\ **g**\|\ **G**\|\ **m**\|\ **s**\|\ **t**\ [**+m**][**+q**\ *quality*] ]
+[ |-T|\ **b**\|\ **e**\|\ **E**\|\ **f**\|\ **F**\|\ **j**\|\ **g**\|\ **G**\|\ **m**\|\ **t**\ [**+m**][**+q**\ *quality*] ]
 [ |SYN_OPT-V| ]
 [ |-W|\ [**+a**\ *altmode*\ [*alt*]][**+c**][**+f**\ *minfade/maxfade*][**+g**][**+k**][**+l**\ *minLOD/maxLOD*][**+n**\ *layername*][**+o**\ *foldername*][**+t**\ *docname*][**+u**\ *URL*] ]
 [ |-Z| ]
diff --git a/doc/rst/source/wiggle.rst b/doc/rst/source/wiggle.rst
@@ -111,7 +111,7 @@ Optional Arguments
 
     .. include:: explain_refpoint.rst_
 
-    Append **+w** followed by the *length* or the scale bar in data (*z*) units.
+    Append **+w** followed by the *length* of the scale bar in data (*z*) units.
     By default, the anchor point on the scale is assumed to be the middle left corner (ML), but this
     can be changed by appending **+j** followed by a 2-char justification code *justify* (see :doc:`text`).
     **Note**: If **-Dj** is used then *justify* defaults to the same as *refpoint*,
diff --git a/src/grdview.c b/src/grdview.c
@@ -608,9 +608,9 @@ static int parse (struct GMT_CTRL *GMT, struct GRDVIEW_CTRL *Ctrl, struct GMT_OP
 					n_errors += gmt_default_option_error (GMT, opt);
 				break;
 			case 'N':	/* Facade */
+				n_errors += gmt_M_repeated_module_option (API, Ctrl->N.active);
 				if (opt->arg[0]) {
 					char colors[GMT_LEN64] = {""};
-					n_errors += gmt_M_repeated_module_option (API, Ctrl->N.active);
 					if ((c = strstr (opt->arg, "+g")) != NULL) {	/* Gave modifier +g<fill> */
 						c[0] = '\0';	/* Truncate string temporarily */
 						if (opt->arg[0])
diff --git a/src/longopt/grdfilter_inc.h b/src/longopt/grdfilter_inc.h
@@ -34,7 +34,7 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
 	GMT_G_OUTGRID_KW,
 	GMT_I_INCREMENT_KW,
 	{ 0, 'N', "nans",
-	          "i,p,r",             "ignore,coregnan,anynan",
+	          "i,p,r",             "ignore,preserve,replace",
 	          "",                  "",
 		  GMT_TP_STANDARD },
 	{ 0, 'T', "toggle_registration|toggle",         "", "", "", "", GMT_TP_STANDARD },
diff --git a/src/psimage.c b/src/psimage.c
@@ -500,16 +500,28 @@ EXTERN_MSC int GMT_psimage (void *V_API, int mode, void *args) {
 		if (I->colormap != NULL) {	/* Image has a color map */
 			/* Convert colormap from integer to unsigned char and count colors */
 			n = gmt_unpack_rgbcolors (GMT, I, colormap);	/* colormap will be RGBARGBA... */
-			if (n == 2 && Ctrl->G.active) {	/* Replace back or fore-ground color with color given in -G, or catch selection for transparency */
-				if (Ctrl->G.rgb[PSIMAGE_TRA][0] != -2) {
-					GMT_Report (API, GMT_MSG_WARNING, "Your -G<color>+t is ignored for 1-bit images; see +b/+f modifiers instead\n");
+			if (n == 2) {	/* 2-color palette image */
+				/* Handle -I (invert) by swapping colormap entries */
+				if (Ctrl->I.active) {
+					unsigned char tmp[4];
+					for (size_t m = 0; m < 4; m++) {
+						tmp[m] = colormap[m];
+						colormap[m] = colormap[4+m];
+						colormap[4+m] = tmp[m];
+					}
 				}
-				for (unsigned int k = PSIMAGE_BGD; k <= PSIMAGE_FGD; k++) {
-					if (Ctrl->G.rgb[k][0] == -1) {	/* Want this color to be transparent */
-						has_trans = 1; r = colormap[4*k]; g = colormap[1+4*k]; b = colormap[2+4*k];
+				/* Replace back or fore-ground color with color given in -G, or catch selection for transparency */
+				if (Ctrl->G.active) {
+					if (Ctrl->G.rgb[PSIMAGE_TRA][0] != -2) {
+						GMT_Report (API, GMT_MSG_WARNING, "Your -G<color>+t is ignored for 1-bit images; see +b/+f modifiers instead\n");
+					}
+					for (unsigned int k = PSIMAGE_BGD; k <= PSIMAGE_FGD; k++) {
+						if (Ctrl->G.rgb[k][0] == -1) {	/* Want this color to be transparent */
+							has_trans = 1; r = colormap[4*k]; g = colormap[1+4*k]; b = colormap[2+4*k];
+						}
+						else if (Ctrl->G.rgb[k][0] >= 0)	/* If we changed this color, update it, else use what was given in the colormap */
+							for (size_t m = 0; m < 3; m++) colormap[m+4*k] = gmt_M_u255(Ctrl->G.rgb[k][m]);	/* Do not override the A entry, just R/G/B */
 					}
-					else if (Ctrl->G.rgb[k][0] >= 0)	/* If we changed this color, update it, else use what was given in the colormap */
-						for (n = 0; n < 3; n++) colormap[n+4*k] = gmt_M_u255(Ctrl->G.rgb[k][n]);	/* Do not override the A entry, just R/G/B */
 				}
 			}
 			if (!Ctrl->G.active) has_trans = psimage_find_unique_color (GMT, colormap, n, &r, &g, &b);
diff --git a/src/pslegend.c b/src/pslegend.c
@@ -129,7 +129,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
 
 	const char *name = gmt_show_name_and_purpose (API, THIS_MODULE_LIB, THIS_MODULE_CLASSIC_NAME, THIS_MODULE_PURPOSE);
 	if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
-	GMT_Usage (API, 0, "usage: %s [<specfile>] -D%s[+w<width>[/<height>]][+l<spacing>]%s [%s] [-F%s] "
+	GMT_Usage (API, 0, "usage: %s [<specfile>] -D%s[+w<width>[/<height>]][+j<justify>][+l<spacing>]%s [%s] [-F%s] "
 		"[%s] [-M[<items>]] %s%s%s[%s] [-S<scale>] [-T<file>] [%s] [%s] [%s] [%s] %s[%s] [%s] [%s] [%s]\n",
 		name, GMT_XYANCHOR, GMT_OFFSET, GMT_B_OPT, GMT_PANEL, GMT_J_OPT, API->K_OPT, API->O_OPT, API->P_OPT, GMT_Rgeo_OPT,
 		GMT_U_OPT, GMT_V_OPT, GMT_X_OPT, GMT_Y_OPT, API->c_OPT, GMT_p_OPT, GMT_qi_OPT, GMT_t_OPT, GMT_PAR_OPT);
diff --git a/test/baseline/psimage.dvc b/test/baseline/psimage.dvc
@@ -1,5 +1,6 @@
 outs:
-- md5: 9b43a20da87f87f52574a2276b1231f8.dir
-  nfiles: 5
+- md5: 2333b3a57c35d4dba11ffb1d01dd7fa4.dir
+  nfiles: 6
   path: psimage
   hash: md5
+  size: 1096404
diff --git a/test/grdfilter/grdfilter-l2s.sh b/test/grdfilter/grdfilter-l2s.sh
@@ -36,7 +36,7 @@ gmt $m $l2s --outgrid=/somefile=nf+divide:10+nan:-999+offset:6 >> $b
 gmt $m $l2s --outgrid=/otherfile+offset:a >> $b
 gmt $m $l2s --outgrid=/otherfile+scale:100+gdal >> $b
 gmt $m $l2s --increment=12+exact/15+number >> $b
-gmt $m $l2s --nans=ignore --nans=coregnan --nans=anynan >> $b
+gmt $m $l2s --nans=ignore --nans=preserve --nans=replace >> $b
 gmt $m $l2s --toggle_registration --toggle >> $b
 
 diff $a $b --strip-trailing-cr > fail
diff --git a/test/psimage/bitimage_invert.sh b/test/psimage/bitimage_invert.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Test -I option for inverting 2-color (1-bit) images
+# This tests the fix for issue #8795
+
+ps=bitimage_invert.ps
+
+# Normal image (black Vader on white background)
+gmt psimage @vader1.png -P -Dx0/0+w2i -F+pfaint -K > $ps
+
+# Inverted image (white Vader on black background) using -I
+gmt psimage @vader1.png -I -Dx2.5i/0+w2i -F+pfaint -O -K >> $ps
+
+# Inverted with color change: red background, yellow foreground
+gmt psimage @vader1.png -I -Gred+b -Gyellow+f -Dx5i/0+w2i -F+pfaint -O >> $ps
