The R Project SVN – R – Diff – /branches/R-exp-API/src/main/plot3d.c

     SEXP col, border;
     double theta, phi, r, d;
     double ltheta, lphi;
     double expand, xc, yc, zc, xs, ys, zs;
     int i, j, scale, ncol, dobox;
-    DevDesc *dd = CurrentDevice();
-    GCheckState(dd);
+    DevDesc *dd;
     if (length(args) < 18)
 	errorcall(call, "too few parameters\n");
     gcall = call;
     originalArgs = args;
     args = CDR(args);
     expand = asReal(CAR(args));
     args = CDR(args);
-    PROTECT(col = FixupCol(CAR(args), NA_INTEGER));
-    ncol = LENGTH(col);
+    col = CAR(args);
-    if (ncol < 1)
-	errorcall(call, "invalid col specification\n");
     args = CDR(args);
-    PROTECT(border = FixupCol(CAR(args), NA_INTEGER));
+    border = CAR(args);
-    if (length(border) < 1)
-	errorcall(call, "invalid border specification\n");
     args = CDR(args);
     ltheta = asReal(CAR(args));
     args = CDR(args);
 	errorcall(call, "invalid expand value\n");
     if (scale == NA_LOGICAL)
 	scale = 0;
     dd = GNewPlot(call != R_NilValue, NA_LOGICAL);
+    PROTECT(col = FixupCol(col, dd->gp.bg));
+    ncol = LENGTH(col);
+    if (ncol < 1) errorcall(call, "invalid col specification\n");
+    PROTECT(border = FixupCol(border, dd->gp.fg));
+    if (length(border) < 1) errorcall(call, "invalid border specification\n");
     GSetState(1, dd);
     GSavePars(dd);
     ProcessInlinePars(args, dd);
     if (length(border) > 1)
 	dd->gp.fg = INTEGER(border)[0];

The R Project SVN R