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

GenericMappingTools · Dec 16, 2024 · b07866b · b07866b
2 parents f50322c + b34b125
commit b07866b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -27,7 +27,7 @@ jobs:
 
     - name: Link Checker
       id: lychee
-      uses: lycheeverse/lychee-action@v2.0.2
+      uses: lycheeverse/lychee-action@v2.1.0
       with:
         # 429: Too many requests
         args: >

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -173,7 +173,7 @@ jobs:
         if: failure()
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v5.0.7
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:

diff --git a/src/grdimage.c b/src/grdimage.c
@@ -1709,10 +1709,6 @@ EXTERN_MSC int GMT_grdimage(void *V_API, int mode, void *args) {
 		}
 		if (!Ctrl->C.active)	/* Set no specific CPT so we turn -C on to use current or default CPT */
 			Ctrl->C.active = true;	/* Use default CPT (GMT->current.setting.cpt) and autostretch or under modern reuse current CPT */
-		if (got_z_grid && Ctrl->Q.mask_color && use_intensity_grid) {
-			GMT_Report (API, GMT_MSG_ERROR, "Option -Q: Cannot specify a transparent color for grids when intensities are also used\n");
-			Return (API->error);
-		}
 	}
 
 	if (got_z_grid) header_work = Grid_orig->header;	/* OK, we are in GRID mode and this was not set previously. Do it now. */