Drop RCurl dependency and use curl instead

wilkelab · Jul 27, 2021 · 7eb9869 · 7eb9869
1 parent 0baa935
commit 7eb9869
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: gridtext
 Type: Package
 Title: Improved Text Rendering Support for 'Grid' Graphics
-Version: 0.1.4.9000
+Version: 0.1.4.9001
 Authors@R: 
     person(
       given = "Claus O.",
@@ -19,12 +19,12 @@ License: MIT + file LICENSE
 Depends:
     R (>= 3.5)
 Imports:
+    curl,
     grid,
     grDevices,
     markdown,
     rlang,
     Rcpp,
-    RCurl,
     png,
     jpeg,
     stringr,

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# gridtext (development version)
+
+- Transition to curl package and drop RCurl dependency
+
 # gridtext 0.1.4.9000
 
 No changes yet.

diff --git a/R/read-image.R b/R/read-image.R
@@ -11,7 +11,7 @@ read_image <- function(path) {
 
 get_file <- function(path) {
   if (is_url(path)) {
-    RCurl::getBinaryURL(path)
+    curl::curl_fetch_memory(path)$content
   } else {
     path
   }

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -6,6 +6,11 @@
 
 using namespace Rcpp;
 
+#ifdef RCPP_USE_GLOBAL_ROSTREAM
+Rcpp::Rostream<true>&  Rcpp::Rcout = Rcpp::Rcpp_cout_get();
+Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
+#endif
+
 // bl_make_null_box
 BoxPtr<GridRenderer> bl_make_null_box(double width_pt, double height_pt);
 RcppExport SEXP _gridtext_bl_make_null_box(SEXP width_ptSEXP, SEXP height_ptSEXP) {