Rboolean -> bool (and some corrections)

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

Author: ripley

src/library/grDevices/src/cairo/cairoBM.c

@@ -91,7 +91,7 @@ static void cbm_Size(double *left, double *right,
 # include "bitmap.h"
 #endif
 
-static Rboolean
+static bool
 BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
 {
     char buf[R_PATH_MAX];
@@ -127,15 +127,15 @@ BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
         if (res != CAIRO_STATUS_SUCCESS) {
             xd->cs = NULL;
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
         if(xd->onefile)
             cairo_svg_surface_restrict_to_version(xd->cs, CAIRO_SVG_VERSION_1_2);
         xd->cc = cairo_create(xd->cs);
         res = cairo_status(xd->cc);
         if (res != CAIRO_STATUS_SUCCESS) {
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
         cairo_set_antialias(xd->cc, xd->antialias);
     }
@@ -149,15 +149,15 @@ BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
         res = cairo_surface_status(xd->cs);
         if (res != CAIRO_STATUS_SUCCESS) {
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
         cairo_surface_set_fallback_resolution(xd->cs, xd->fallback_dpi,
                                               xd->fallback_dpi);
         xd->cc = cairo_create(xd->cs);
         res = cairo_status(xd->cc);
         if (res != CAIRO_STATUS_SUCCESS) {
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
         cairo_set_antialias(xd->cc, xd->antialias);
     }
@@ -171,7 +171,7 @@ BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
         res = cairo_surface_status(xd->cs);
         if (res != CAIRO_STATUS_SUCCESS) {
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
 // We already require >= 1.2
 #if CAIRO_VERSION_MAJOR > 2 || CAIRO_VERSION_MINOR >= 6
@@ -184,7 +184,7 @@ BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
         res = cairo_status(xd->cc);
         if (res != CAIRO_STATUS_SUCCESS) {
             warning("cairo error '%s'", cairo_status_to_string(res));
-            return FALSE;
+            return false;
         }
         cairo_set_antialias(xd->cc, xd->antialias);
     }
@@ -198,7 +198,7 @@ BM_Open(pDevDesc dd, pX11Desc xd, int width, int height)
     CairoInitGroups(xd);
     xd->appending = 0;
 
-    return TRUE;
+    return true;
 }
 
 
@@ -397,18 +397,18 @@ static void BM_Close(pDevDesc dd)
 
 
 
-static Rboolean
+static bool
 BMDeviceDriver(pDevDesc dd, int kind, SEXP filename,
 	       int quality, int width, int height, int ps,
 	       int bg, int res, int antialias, const char *family,
-	       double dpi, const char *symbolfamily, Rboolean usePUA)
+	       double dpi, const char *symbolfamily, bool usePUA)
 {
     pX11Desc xd;
     int res0 = (res > 0) ? res : 72;
     double dps = ps;
 
     /* allocate new device description */
-    if (!(xd = (pX11Desc) calloc(1, sizeof(X11Desc)))) return FALSE;
+    if (!(xd = (pX11Desc) calloc(1, sizeof(X11Desc)))) return false;
     strncpy(xd->filename, R_ExpandFileName(translateCharFP(filename)),
             R_PATH_MAX - 1);
     xd->filename[R_PATH_MAX - 1] = '\0';
@@ -463,7 +463,7 @@ BMDeviceDriver(pDevDesc dd, int kind, SEXP filename,
 
     if (!BM_Open(dd, xd, width, height)) {
 	free(xd);
-	return FALSE;
+	return false;
     }
     if (xd->type == SVG || xd->type == PDF || xd->type == PS)
 	xd->onefile = quality != 0;
@@ -557,7 +557,7 @@ BMDeviceDriver(pDevDesc dd, int kind, SEXP filename,
 
     dd->deviceSpecific = (void *) xd;
 
-    return TRUE;
+    return true;
 }
 
 const static struct {
@@ -585,7 +585,7 @@ SEXP in_Cairo(SEXP args)
     pGEDevDesc gdd;
     SEXP sc;
     const char *family, *symbolfamily;
-    Rboolean usePUA;
+    bool usePUA;
     int type, quality, width, height, pointsize, bgcolor, res, antialias;
     double dpi;
     SEXP filename;
@@ -646,7 +646,7 @@ SEXP in_Cairo(SEXP args)
 	error(_("invalid '%s' argument"), "symbolfamily");
     symbolfamily = translateChar(STRING_ELT(CAR(args), 0));
     /* scsymbol forced to have "usePUA" attribute in R code */
-    usePUA = asRboolean(getAttrib(CAR(args), install("usePUA")));
+    usePUA = asBool(getAttrib(CAR(args), install("usePUA")));
 
     R_GE_checkVersionOrDie(R_GE_version);
     R_CheckDeviceAvailable();

src/library/grDevices/src/cairo/cairoBM.h

@@ -1,6 +1,6 @@
 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1997--2023  R Core Team
+ *  Copyright (C) 1997--2025  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
@@ -95,7 +95,7 @@ typedef struct {
     double pointsize;			/* Size in points */
     char basefontfamily[500];           /* Initial font family */
     char symbolfamily[500];             /* Symbol font family */
-    Rboolean usePUA;
+    bool usePUA;
 
     int windowWidth;			/* Window width (pixels) */
     int windowHeight;			/* Window height (pixels) */
@@ -111,9 +111,9 @@ typedef struct {
     int res_dpi;			/* used for png/jpeg */
     double fallback_dpi;		/* used for ps/pdf */
     char title[101];
-    Rboolean onefile;
+    bool onefile;
 
-    Rboolean useCairo, buffered;
+    bool useCairo, buffered;
     cairo_t *cc, *xcc;
     cairo_surface_t *cs, *xcs;
     cairo_antialias_t antialias;