viewportClip can return NA_LOGICAL, so cannot be Rboolean

git-svn-id: https://svn.r-project.org/R/trunk@87820 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: ripley

src/library/grid/src/grid.h

@@ -560,7 +560,7 @@ double viewportFontSize(SEXP vp);
 double viewportLineHeight(SEXP vp);
 
 SEXP viewportClipSXP(SEXP vp);
-Rboolean viewportClip(SEXP vp);
+int viewportClip(SEXP vp);
 
 SEXP viewportMaskSXP(SEXP vp);
 Rboolean viewportMask(SEXP vp);

src/library/grid/src/layout.c

@@ -1,7 +1,7 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
  *  Copyright (C) 2001-3 Paul Murrell
- *                2003-2013 The R Core Team
+ *                2003-2025 The R Core Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@ double layoutVJust(SEXP l) {
 
 Rboolean relativeUnit(SEXP unit, int index,
 		   pGEDevDesc dd) {
-    return pureNullUnit(unit, index, dd);
+    return (Rboolean) pureNullUnit(unit, index, dd);
 }
 
 void findRelWidths(SEXP layout, int *relativeWidths,

src/library/grid/src/viewport.c

@@ -42,7 +42,8 @@ SEXP viewportClipSXP(SEXP vp) {
     return VECTOR_ELT(vp, VP_CLIP);
 }
 
-Rboolean viewportClip(SEXP vp) {
+// This can be NA_LOGICAL, and it is tested for that in grd.c
+int viewportClip(SEXP vp) {
     return LOGICAL(VECTOR_ELT(vp, VP_CLIP))[0];
 }
 
@@ -54,7 +55,7 @@ Rboolean viewportMask(SEXP vp) {
     SEXP mask = viewportMaskSXP(vp);
     if (!isLogical(mask))
         error(_("Mask is not logical value ('none' or 'inherit')"));
-    return LOGICAL(VECTOR_ELT(vp, VP_MASK))[0];
+    return asRboolean(VECTOR_ELT(vp, VP_MASK));
 }
 
 double viewportXScaleMin(SEXP vp) {