revert to original

Author: Sebastian Kopf

R/save.r

@@ -12,7 +12,6 @@
 #' @param filename file name/filename of plot
 #' @param plot plot to save, defaults to last plot displayed
 #' @param device device to use, automatically extract from file name extension
-#'    (or from paramter \code{ext} if specified)
 #' @param path path to save plot to (if you just want to set path and not
 #'    filename)
 #' @param scale scaling factor
@@ -23,9 +22,6 @@
 #' @param limitsize when \code{TRUE} (the default), \code{ggsave} will not
 #'   save images larger than 50x50 inches, to prevent the common error of
 #'   specifying dimensions in pixels.
-#' @param ext file extension to use for choosing the correct device (pdf, jpg, png, etc.), 
-#'   uses extension of the filename by default, specify if filename does not have
-#'   an instructive extension (or none at all, e.g. in a temporary file)
 #' @param ... other arguments passed to graphics device
 #' @export
 #' @examples
@@ -40,9 +36,9 @@
 #' ggsave("ratings.pdf", ratings, scale=2)
 #' }
 ggsave <- function(filename = default_name(plot), plot = last_plot(),
-  device = default_device(ext), path = NULL, scale = 1,
+  device = default_device(filename), path = NULL, scale = 1,
   width = par("din")[1], height = par("din")[2], units = c("in", "cm", "mm"),
-  dpi = 300, limitsize = TRUE, ext = default_ext(filename), ...) {
+  dpi = 300, limitsize = TRUE, ...) {
 
   if (!inherits(plot, "ggplot")) stop("plot should be a ggplot2 plot")
 
@@ -73,14 +69,10 @@ ggsave <- function(filename = default_name(plot), plot = last_plot(),
     paste(digest.ggplot(plot), ".pdf", sep="")
   }
 
-  default_ext <- function(filename) {
+  default_device <- function(filename) {
     pieces <- strsplit(filename, "\\.")[[1]]
     ext <- tolower(pieces[length(pieces)])
-  }
-  
-  default_device <- function(ext) {
-    tryCatch(match.fun(ext), error = function(e) 
-      stop(sprintf("Cannot find a graphics device that matches file extension '%s'.", ext)))
+    match.fun(ext)
   }
 
   units <- match.arg(units)