use grDevices:: for dev.cur et al.

diff --git a/R/bookmarks.R b/R/bookmarks.R
index 4ced5a3504cfb90662abce4b5d53e4f9804d56f7..30bd12fef219559020032e1b33e9ae183cf52606 100644 (file)
--- a/R/bookmarks.R
+++ b/R/bookmarks.R
@@ -28,7 +28,7 @@ CairoHacks.env$current_page <- 0
 ##' write.pdf.bookmarks(file="example.pdf",bookmarks)
 make.pdf.bookmark <- function(text,level=1,page=NULL) {
     if (!CairoHacks.env$device_set_up) {
-        Cairo.onSave(device = dev.cur(),
+        Cairo.onSave(device = grDevices::dev.cur(),
                      onSave=function(device,page){
                          ch <- getNamespace("CairoHacks")
                          print(ls(envir=ch))

diff --git a/R/raster_plots.R b/R/raster_plots.R
index 2e831a94afcdb9ce2cf69f160915ffd2b8de9cf7..419c5de47a52951dc67bf2f90b9a081f3b268b88 100644 (file)
--- a/R/raster_plots.R
+++ b/R/raster_plots.R
@@ -65,8 +65,8 @@ start_rasterplot <- function(width=NULL,height=NULL) {
 ##' @export
 ##' @seealso start_rasterplot
 stop_rasterplot <- function(plot=TRUE) {
-    raster.image <- dev.capture(native=TRUE)
-    dev.off()
+    raster.image <- grDevices::dev.capture(native=TRUE)
+    grDevices::dev.off()
     if (plot) {
         grid::grid.raster(raster.image,width=grid::unit(1,"npc"),height=grid::unit(1,"npc"))
     }