fixes for CRAN, native symbols forcing

edzer · Mar 21, 2023 · 9b07e12 · 9b07e12
1 parent 367ab7b
commit 9b07e12
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: hexbin
-Version: 1.28.2
+Version: 1.28.3
 Title: Hexagonal Binning Routines
 Author: Dan Carr <dcarr@voxel.galaxy.gmu.edu>, ported by Nicholas
         Lewin-Koh and Martin Maechler <maechler@stat.math.ethz.ch>,
@@ -17,4 +17,4 @@ Collate: lattice.R BTC.R BTY.R grid.hexagons.R grid.hexlegend.R hbox.R
 License: GPL-2
 VignetteBuilder: knitr
 NeedsCompilation: yes
-URL: http://github.com/edzer/hexbin
+URL: https://github.com/edzer/hexbin
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-useDynLib(hexbin)
+useDynLib(hexbin, .registration=TRUE)
 
 
 import(methods)

diff --git a/R/hexbin.s4.R b/R/hexbin.s4.R
@@ -44,7 +44,7 @@ hexbin <-
     c1 <- 2 * floor((xbins *shape)/sqrt(3) + 1.5001)
     imax <- trunc((jmax*c1 -1)/jmax + 1)
     lmax <- jmax * imax
-    ans <- .Fortran("hbin",
+    ans <- .Fortran(`hbin`,
 	      x = as.double(x),
 	      y = as.double(y),
 	      cell = integer(lmax),
@@ -162,7 +162,7 @@ erode.hexbin <- function(hbin, cdfcut = 0.5)
     n <- length(cell)
     bdim <- hbin@dimen
     L <- bdim[1] * bdim[2]
-    ans <- .Fortran("herode",
+    ans <- .Fortran(`herode`,
 		    cell  = as.integer(cell),
 		    cnt	  = as.integer(cnt),
 		    n	  = n,

diff --git a/R/smoothHexbin.R b/R/smoothHexbin.R
@@ -23,7 +23,7 @@ smooth.hexbin <- function(bin, wts = c(48, 4, 1))
     pad <- rep.int(0:0, nmax - n)
     cell <- c(nr * ncol + nc, pad)
     cnt <- c(cnt, pad)
-    ans <- .Fortran("hsm",
+    ans <- .Fortran(`hsm`,
                     cell = as.integer(cell),
                     cnt  = as.integer(cnt),
                     n    = n,

diff --git a/man/erode.hexbin.Rd b/man/erode.hexbin.Rd
@@ -40,7 +40,7 @@ erode.hexbin(hbin, cdfcut = 0.5)
   empty or have a count deficit on each erosion cycle.  The erode vector
   contain an erosion number for each cell.   The value of  erode is
 
-  6*erosion\_cycle\_ at\_ cell\_ removal - cell\_deficit\_at\_removal
+  6*erosion_cycle_at_cell_removal - cell_deficit_at_removal
 
   Cells with low values are eroded first.   The cell with the highest
   erosion number is a candidate bivariate median.  A few ties in erode

diff --git a/src/reg.c b/src/reg.c
@@ -13,7 +13,7 @@ static const R_FortranMethodDef FortranEntries[] = {
 	{NULL, NULL, 0}
 };
 
-void R_init_myLib(DllInfo *info) {
+void R_init_hexbin(DllInfo *info) {
 	R_registerRoutines(info, NULL, NULL, FortranEntries, NULL);
 	R_useDynamicSymbols(info, FALSE);
 	R_forceSymbols(info, TRUE);