bring 0.6-2.1 changes to 0.6-3(.3)

DESCRIPTION

 Package: akima
-Version: 0.6-3
-Date: 2016-12-27
+Version: 0.6-3.3
+Date: 2020-05-31
 Title: Interpolation of Irregularly and Regularly Spaced Data
 Authors@R: c(person("Hiroshi", "Akima", role = c("aut", "cph"),
 		     comment = "Fortran code (TOMS 760, 761, 697 and 433)"),
@@ -25,3 +25,15 @@ Description: Several cubic spline interpolation methods of H. Akima for irregula
 License: ACM | file LICENSE
 Depends: R (>= 2.0.0)
 Imports: sp
+NeedsCompilation: yes
+Packaged: 2020-05-30 09:17:28 UTC; ripley
+Author: Hiroshi Akima [aut, cph] (Fortran code (TOMS 760, 761, 697 and 433)),
+  Albrecht Gebhardt [aut, cre, cph] (R port (interp* functions), bicubic*
+    functions),
+  Thomas Petzold [ctb, cph] (aspline function),
+  Martin Maechler [ctb, cph] (interp2xyz function + enhancements),
+  YYYY Association for Computing Machinery, Inc. [cph] (covers code from
+    TOMS 760, 761, 697 and 433)
+License_restricts_use: yes
+Repository: CRAN
+Date/Publication: 2020-05-30 09:50:55 UTC

src/akima.h

@@ -2,41 +2,41 @@
 #include <R.h>
 
 /* ACM 526, removed in version 0.6-3:
-int F77_NAME(idbvip) (int *md, int *ncp, int *ndp,
+exten void F77_NAME(idbvip) (int *md, int *ncp, int *ndp,
                       double *xd, double *yd, double *zd,
                       int *nip, double *xi, double *yi, double *zi,
-                      int *iwk, double *wk, int *missi);
+                      int *iwk, double *wk, void *missi);
 
-int F77_NAME(idsfft) (int *md, int *ncp, int *ndp,
+exten void F77_NAME(idsfft) (int *md, int *ncp, int *ndp,
                       double *xd, double *yd,double *zd,
                       int *nxi, int *nyi,
                       double *xi, double *yi, double *zi,
-                      int *iwk, double *wk, int *missi);
+                      int *iwk, double *wk, void *missi);
 */
 
 /* ACM 679: */
-int F77_NAME(uvip3p) (int *np, int *nd, double *xd, double *yd,
+extern void F77_NAME(uvip3p) (int *np, int *nd, double *xd, double *yd,
 		      int *ni, double *xi, double *yi, int *err);
 
 /* ACM 433: */
-int F77_NAME(intrpl) (int *l,double *x, double *y, int *n,
+extern void F77_NAME(intrpl) (int *l,double *x, double *y, int *n,
 		      double *u, double *v, int *err);
 
 /* ACM 760: */
-int F77_NAME(rgbi3p) (int *md, int *nxd, int *nyd, double *xd, double *yd, double *zd,
-		      int *nip, double *xi, double *yi, double *zi, int *err);
+extern void F77_NAME(rgbi3p) (int *md, int *nxd, int *nyd, double *xd, double *yd, double *zd,
+		      int *nip, double *xi, double *yi, double *zi, int *err, double *wk);
 
 /* ACM 761: */
-int F77_NAME(sdsf3p) (int *md, int *ndp, double *xd, double *yd, double *zd,
+extern void F77_NAME(sdsf3p) (int *md, int *ndp, double *xd, double *yd, double *zd,
 		      int *nxi, double *xi, int *nyi, double *yi, double *zi,
 		      int *ier, double *wk, int *iwk,
-		      int *extrpi, int *linear, double *hbrmn, int *nrrtt);
-int F77_NAME(sdbi3p) (int *md, int *ndp, double *xd, double *yd, double *zd,
+		      void *extrpi, void *linear, double *hbrmn, int *nrrtt);
+extern void F77_NAME(sdbi3p) (int *md, int *ndp, double *xd, double *yd, double *zd,
 		      int *nip, double *xi, double *yi, double *zi,
 		      int *ier, double *wk, int *iwk,
-		      int *extrpi, int *linear, double *hbrmn, int *nrrtt);
+		      void *extrpi, void *linear, double *hbrmn, int *nrrtt);
 
 /* bilinear, A. Gebhardt: */
-int F77_NAME(biliip) (double *x0, double *y0, double *z0,
-                      double *x, double *y, double *z,
+extern void F77_NAME(biliip) (double *x0, double *y0, double *z0,
+                      int *n0, double *x, double *y, double *z,
                       int *nx, int *ny, int *ier);

src/init.c

@@ -172,4 +172,5 @@ R_init_akima(DllInfo *info)
   R_registerRoutines(info,
 		     NULL /*cMethods*/, NULL /*callMethods*/,
 		     fortranMethods, NULL/*externalMethods*/);
+  R_useDynamicSymbols(info, FALSE);
 }