Use GEcreateDD() and GEfreeDD() on Windows graphic device (related to 88803,

from Paul Murrell).


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

Author: kalibera

src/library/grDevices/src/devWindows.c

@@ -347,13 +347,13 @@ static void PrivateCopyDevice(pDevDesc dd, pDevDesc ndd, const char *name)
 static void SaveAsWin(pDevDesc dd, const char *display,
 		      Rboolean restoreConsole)
 {
-    pDevDesc ndd = (pDevDesc) calloc(1, sizeof(DevDesc));
+    pDevDesc ndd = GEcreateDD();
     if (!ndd) {
 	R_ShowMessage(_("Not enough memory to copy graphics window"));
 	return;
     }
     if(!R_CheckDeviceAvailableBool()) {
-	free(ndd);
+	GEfreeDD(ndd);
 	R_ShowMessage(_("No device available to copy graphics window"));
 	return;
     }
@@ -392,7 +392,7 @@ static void init_PS_PDF(void)
 static void SaveAsPostscript(pDevDesc dd, const char *fn)
 {
     SEXP s;
-    pDevDesc ndd = (pDevDesc) calloc(1, sizeof(DevDesc));
+    pDevDesc ndd = GEcreateDD();
     pGEDevDesc gdd = desc2GEDesc(dd);
     gadesc *xd = (gadesc *) dd->deviceSpecific;
     char family[256], encoding[256], paper[256], bg[256], fg[256];
@@ -403,7 +403,7 @@ static void SaveAsPostscript(pDevDesc dd, const char *fn)
 	return;
     }
     if(!R_CheckDeviceAvailableBool()) {
-	free(ndd);
+	GEfreeDD(ndd);
 	R_ShowMessage(_("No device available to copy graphics window"));
 	return;
     }
@@ -462,7 +462,7 @@ static void SaveAsPostscript(pDevDesc dd, const char *fn)
 static void SaveAsPDF(pDevDesc dd, const char *fn)
 {
     SEXP s;
-    pDevDesc ndd = (pDevDesc) calloc(1, sizeof(DevDesc));
+    pDevDesc ndd = GEcreateDD();
     pGEDevDesc gdd = desc2GEDesc(dd);
     gadesc *xd = (gadesc *) dd->deviceSpecific;
     char family[256], encoding[256], bg[256], fg[256];
@@ -477,7 +477,7 @@ static void SaveAsPDF(pDevDesc dd, const char *fn)
 	return;
     }
     if(!R_CheckDeviceAvailableBool()) {
-	free(ndd);
+	GEfreeDD(ndd);
 	R_ShowMessage(_("No device available to copy graphics window"));
 	return;
     }
@@ -644,13 +644,14 @@ static char* translateFontFamily(const char* family) {
     PROTECT(graphicsNS = R_FindNamespace(ScalarString(mkChar("grDevices"))));
     PROTECT_WITH_INDEX(windowsenv = findVar(install(".WindowsEnv"),
 					    graphicsNS), &xpi);
-    if(TYPEOF(windowsenv) == PROMSXP)
+    if(TYPEOF(windowsenv) == PROMSXP) {
         if (NoDevices()) {
             REPROTECT(windowsenv = eval(windowsenv, graphicsNS), xpi);
         } else {
             REPROTECT(windowsenv = Rf_eval_with_gd(windowsenv, graphicsNS,
                                                    NULL), xpi);
         }
+    }
     PROTECT(fontdb = findVar(install(".Windows.Fonts"), windowsenv));
     PROTECT(fontnames = getAttrib(fontdb, R_NamesSymbol));
     nfonts = LENGTH(fontdb);
@@ -3337,7 +3338,7 @@ Rboolean GADeviceDriver(pDevDesc dd, const char *display, double width,
 			int quality, double xpinch, double ypinch)
 {
     /* if need to bail out with some sort of "error" then */
-    /* must free(dd) */
+    /* must GEfreeDD(dd) */
 
     int   ps; /* This really is in (big) points */
     gadesc *xd;
@@ -3349,9 +3350,6 @@ Rboolean GADeviceDriver(pDevDesc dd, const char *display, double width,
 	return FALSE;
     }
 
-    /* from here on, if need to bail out with "error", must also */
-    /* free(xd) */
-
     /* Allow user override of ppi */
     xd->xpinch = 0.0;
     xd->ypinch = 0.0;
@@ -3856,13 +3854,13 @@ SEXP devga(SEXP args)
 	    if(p && strncmp(display, "win.metafile", 12)) *p = '\0';
 	}
 	/* Allocate and initialize the device driver data */
-	if (!(dev = (pDevDesc) calloc(1, sizeof(DevDesc)))) return 0;
+	if (!(dev = GEcreateDD())) return 0;
 	if (!GADeviceDriver(dev, display, width, height, ps,
 			    (Rboolean)recording, resize, bg, canvas, gamma,
 			    xpos, ypos, (Rboolean)buffered, psenv,
 			    restoreConsole, title, clickToConfirm,
 			    fillOddEven, family, quality, xpinch, ypinch)) {
-	    free(dev);
+	    GEfreeDD(dev);
 	    error(_("unable to start %s() device"), type);
 	}
 	gdd = GEcreateDevDesc(dev);