Browse code

fix: use R_Calloc/R_Free instead of Calloc/Free to reflect changes in R API

Sebastian Gibb authored on 20/10/2024 09:59:14
Showing 3 changed files

... ...
@@ -1,6 +1,6 @@
1 1
 Package: MsCoreUtils
2 2
 Title: Core Utils for Mass Spectrometry Data
3
-Version: 1.17.2
3
+Version: 1.17.3
4 4
 Description: MsCoreUtils defines low-level functions for mass
5 5
     spectrometry data and is independent of any high-level data
6 6
     structures. These functions include mass spectra processing
... ...
@@ -1,5 +1,11 @@
1 1
 # MsCoreUtils 1.17
2 2
 
3
+## MsCoreUtils 1.17.3
4
+
5
+- Use `R_Calloc` and `R_Free` instead of `Calloc` and `Free` in
6
+  `src/lowerConvexHull.c`, respectively, to reflect changes in the R API and
7
+  fullfil STRICT_R_HEADERS check.
8
+
3 9
 ## MsCoreUtils 1.17.2
4 10
 
5 11
 - Fix typo in normalisation methods description.
... ...
@@ -43,7 +43,7 @@ SEXP C_lowerConvexHull(SEXP x, SEXP y) {
43 43
   PROTECT(output=allocVector(REALSXP, n));
44 44
   /* TODO: replace by R_xlen_t in R 3.0.0 */
45 45
   /* allocate vector - error handling is done by R */
46
-  nodes=(int*) Calloc((size_t) n, int);
46
+  nodes=(int*) R_Calloc((size_t) n, int);
47 47
 
48 48
   double* xx=REAL(x);
49 49
   double* xy=REAL(y);
... ...
@@ -71,7 +71,7 @@ SEXP C_lowerConvexHull(SEXP x, SEXP y) {
71 71
 
72 72
   xo[n-1]=xy[n-1];
73 73
 
74
-  Free(nodes);
74
+  R_Free(nodes);
75 75
   UNPROTECT(3);
76 76
 
77 77
   return(output);