Use newer Rcpp.

rorynolan · Dec 13, 2023 · 6ab4106 · 6ab4106
1 parent 2534625
commit 6ab4106
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: autothresholdr
 Title: An R Port of the 'ImageJ' Plugin 'Auto Threshold'
-Version: 1.4.1
+Version: 1.4.2
 Authors@R: c(
     person("Rory", "Nolan", , "rorynoolan@gmail.com", role = c("aut", "cre", "trl"),
            comment = c(ORCID = "0000-0002-5239-4043")),
@@ -29,7 +29,7 @@ Imports:
     ijtiff (>= 2.2),
     magrittr (>= 1.5),
     purrr,
-    Rcpp (>= 1.0.1),
+    Rcpp (>= 1.0.11),
     rlang (>= 0.3.3),
     stats,
     strex (>= 1.4.1),
@@ -45,7 +45,7 @@ Suggests:
     testthat (>= 3.0),
     utils
 LinkingTo: 
-    Rcpp (>= 1.0.1)
+    Rcpp (>= 1.0.11)
 VignetteBuilder: 
     knitr
 Config/testthat/edition: 3

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# `autothresholdr` 1.4.2
+
+## BUG FIXES
+* Needed new compile with later version of `Rcpp` to avoid CRAN warning.
+
+
 # `autothresholdr` 1.4.1
 
 ## BUG FIXES

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -87,5 +87,5 @@ median_pillars <- function(arr3d) {
 
 # Register entry points for exported C++ functions
 methods::setLoadAction(function(ns) {
-    .Call('_autothresholdr_RcppExport_registerCCallable', PACKAGE = 'autothresholdr')
+    .Call(`_autothresholdr_RcppExport_registerCCallable`)
 })
diff --git a/codemeta.json b/codemeta.json
@@ -4,17 +4,17 @@
   "identifier": "autothresholdr",
   "description": "Algorithms for automatically finding appropriate thresholds for numerical data, with special functions for thresholding images. Provides the 'ImageJ' 'Auto Threshold' plugin functionality to R users. See <https://imagej.net/plugins/auto-threshold> and Landini et al. (2017) <DOI:10.1111/jmi.12474>.",
   "name": "autothresholdr: An R Port of the 'ImageJ' Plugin 'Auto Threshold'",
-  "relatedLink": ["https://rorynolan.github.io/autothresholdr/", "https://CRAN.R-project.org/package=autothresholdr"],
+  "relatedLink": "https://rorynolan.github.io/autothresholdr/",
   "codeRepository": "https://github.com/rorynolan/autothresholdr",
   "issueTracker": "https://github.com/rorynolan/autothresholdr/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.2.1 (2022-06-23)",
+  "runtimePlatform": "R version 4.2.0 (2022-04-22)",
   "provider": {
     "@id": "https://cran.r-project.org",
     "@type": "Organization",
@@ -252,7 +252,7 @@
       "@type": "SoftwareApplication",
       "identifier": "Rcpp",
       "name": "Rcpp",
-      "version": ">= 1.0.1",
+      "version": ">= 1.0.11",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
@@ -307,7 +307,7 @@
     },
     "SystemRequirements": null
   },
-  "fileSize": "2820.755KB",
+  "fileSize": "2989.315KB",
   "citation": [
     {
       "@type": "ScholarlyArticle",
@@ -347,9 +347,5 @@
         }
       }
     }
-  ],
-  "releaseNotes": "https://github.com/rorynolan/autothresholdr/blob/master/NEWS.md",
-  "readme": "https://github.com/rorynolan/autothresholdr/blob/master/README.md",
-  "contIntegration": ["https://github.com/rorynolan/autothresholdr/actions", "https://ci.appveyor.com/project/rorynolan/autothresholdr", "https://codecov.io/gh/rorynolan/autothresholdr?branch=master"],
-  "developmentStatus": ["https://www.repostatus.org/", "https://lifecycle.r-lib.org/articles/stages.html"]
+  ]
 }
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -229,7 +229,7 @@ RcppExport SEXP _autothresholdr_sum_pillars(SEXP arr3dSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -263,7 +263,7 @@ RcppExport SEXP _autothresholdr_mean_pillars(SEXP arr3dSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -297,7 +297,7 @@ RcppExport SEXP _autothresholdr_var_pillars(SEXP arr3dSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;
@@ -331,7 +331,7 @@ RcppExport SEXP _autothresholdr_median_pillars(SEXP arr3dSEXP) {
     if (rcpp_isError_gen) {
         SEXP rcpp_msgSEXP_gen = Rf_asChar(rcpp_result_gen);
         UNPROTECT(1);
-        Rf_error(CHAR(rcpp_msgSEXP_gen));
+        Rf_error("%s", CHAR(rcpp_msgSEXP_gen));
     }
     UNPROTECT(1);
     return rcpp_result_gen;