stop confusing Rboolean with logical

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

Author: murrell

src/library/grid/R/coords.R

@@ -613,8 +613,8 @@ grobPoints.text <- function(x, closed=TRUE, ...) {
 
 grobPoints.points <- function(x, closed=TRUE, ...) {
     closed <- as.logical(closed)
-    if (is.na(closed)) 
-        stop("Closed must not be a missing value")
+    if (length(closed) != 1 || is.na(closed)) 
+        stop("Closed must be length 1 and must not be a missing value")
     pts <- grid.Call(C_pointsPoints, x$x, x$y, x$pch, x$size, closed)
     if (is.null(pts) ||
         all(sapply(pts, is.null))) {

src/library/grid/src/grid.c

@@ -5119,12 +5119,13 @@ static SEXP gridPoints(SEXP x, SEXP y, SEXP pch, SEXP size,
 
 SEXP L_points(SEXP x, SEXP y, SEXP pch, SEXP size)
 {
-    return gridPoints(x, y, pch, size, TRUE, NA_LOGICAL);
+    return gridPoints(x, y, pch, size, TRUE, FALSE);
 }
 
 SEXP L_pointsPoints(SEXP x, SEXP y, SEXP pch, SEXP size, SEXP closed)
 {
-    return gridPoints(x, y, pch, size, FALSE, LOGICAL(closed)[0]);
+    /* 'closed' type checked in R code */
+    return gridPoints(x, y, pch, size, FALSE, asRboolean(closed));
 }
 
 SEXP L_clip(SEXP x, SEXP y, SEXP w, SEXP h, SEXP hjust, SEXP vjust)