The R Project SVN – R – Diff – /trunk/src/main/dotcode.c

 #include <string.h>
 #include <stdlib.h>
 #include <Defn.h>
 #include <Rmath.h>
-#include <Rdevices.h>
+#include <Graphics.h>
 #include <R_ext/RConverters.h>
 #ifndef max
 #define max(a, b) ((a > b)?(a):(b))
 /*  Call dynamically loaded "internal" graphics functions */
 /*  .External.gr  and  .Call.gr */
 SEXP do_Externalgr(SEXP call, SEXP op, SEXP args, SEXP env)
+{
+    SEXP retval;
-    SEXP retval = do_External(call, op, args, env);
+    PROTECT(retval = do_External(call, op, args, env));
     if (call != R_NilValue) {
-        DevDesc *dd = CurrentDevice();
+        GEDevDesc *dd = GEcurrentDevice();
-        GCheckState(dd);
+	if (!GEcheckState(dd))
+	    error("Invalid graphics state");
-	recordGraphicOperation(op, args, dd);
+	GErecordGraphicOperation(op, args, dd);
+    }
+    UNPROTECT(1);
     return retval;
+}
 SEXP do_dotcallgr(SEXP call, SEXP op, SEXP args, SEXP env)
+{
+    SEXP retval;
-    SEXP retval = do_dotcall(call, op, args, env);
+    PROTECT(retval = do_dotcall(call, op, args, env));
     if (call != R_NilValue) {
-        DevDesc *dd = CurrentDevice();
+        GEDevDesc *dd = GEcurrentDevice();
-	GCheckState(dd);
+	if (!GEcheckState(dd))
+	    error("Invalid graphics state");
-	recordGraphicOperation(op, args, dd);
+	GErecordGraphicOperation(op, args, dd);
+    }
+    UNPROTECT(1);
     return retval;
+}

The R Project SVN R