1.8.1

Author: Jean-Romain

DESCRIPTION

@@ -3,7 +3,7 @@ Type: Package
 Title: Read and Write 'las' and 'laz' Binary File Formats Used for Remote Sensing Data
 Version: 1.8.1
 Authors@R: c(
-    person("Jean-Romain", "Roussel", email = "info@r-lidar.com", role = c("aut", "cre", "cph")),
+    person("Jean-Romain", "Roussel", email = "jean-romain.roussel.1@ulaval.ca", role = c("aut", "cre", "cph")),
     person("Florian", "De Boissieu", email = "", role = c("aut", "ctb"), comment = "Enable the support of .lax file and extra byte attributes"),
     person("Martin", "Isenburg", email = "", role = "cph", comment = "Is the author of the LASlib and LASzip libraries"),
     person("David", "Auty", email = "", role = c("ctb"), comment = "Reviewed the documentation"),
@@ -15,7 +15,7 @@ BugReports: https://github.com/r-lidar/rlas/issues
 License: GPL-3
 Depends: R (>= 3.6.0)
 Imports: Rcpp, data.table, utils
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 LinkingTo: Rcpp
 Suggests: tinytest
 Encoding: UTF-8

NAMESPACE

@@ -68,6 +68,7 @@ export(is_valid_scalefactors)
 export(is_valid_version)
 export(read.las)
 export(read.lasheader)
+export(stream.las)
 export(true_size)
 export(write.las)
 export(writelax)

NEWS.md

@@ -1,11 +1,9 @@
-### rlas v1.8.2
-
-- Fix: can read file with multiple extra bytes definitions
-- change maintainer's email address
-
 ### rlas v1.8.1
 
+- Fix: can read file with multiple extra bytes definitions
+- Fix CRAN: Found non-API call to R: ‘DATAPTR’ for altrep
 - Removed a `boost` header still included in the code.
+- Function `stream.las` exposed to users
 
 ### rlas v1.8.0
 

R/readLAS.r

@@ -126,6 +126,10 @@ read.lasheader = function(file)
   return(data)
 }
 
+#' @rdname read.las
+#' @param ifiles,ofile characters. Streaming operations.
+#' @param polygons list. Internal use only.
+#' @export
 stream.las = function(ifiles, ofile = "", select = "*", filter = "", polygons = list())
 {
   stream    <- ofile != ""

man/read.las.Rd

@@ -171,73 +171,70 @@ struct compact_repetition
   //
   // This is guaranteed to never allocate (in the R sense)
   static const void* Dataptr_or_null(SEXP vec) {
-    //Rprintf("Calling Dataptr_or_null on a compact_repetition at %p\n", R_ExternalPtrAddr(vec));
     SEXP data2 = R_altrep_data2(vec);
     if (data2 == R_NilValue) return nullptr;
-    return DATAPTR(data2);
+
+    switch (TYPEOF(data2)) {
+    case INTSXP: return INTEGER(data2);
+    case REALSXP: return REAL(data2);
+    case LGLSXP: return LOGICAL(data2);
+    case RAWSXP: return RAW(data2);
+    default: return nullptr; // fallback if unknown type
+    }
   }
 
-  // same in this case, writeable is ignored
   static void* DataptrInt(SEXP vec, Rboolean writeable)
   {
     SEXP data2 = R_altrep_data2(vec);
-    if (data2 != R_NilValue)
-    {
-      //Rprintf("Returning pointer to materialized compact_repetition at %p\n", R_ExternalPtrAddr(vec));
-      return DATAPTR(data2);
+    if (data2 != R_NilValue) {
+      return INTEGER(data2);
     }
 
-    //Rprintf("Materializing a compact repetition at %p\n", R_ExternalPtrAddr(vec));
     int n = Length(vec);
     auto v = Get(vec).value;
     SEXP val = PROTECT(Rf_allocVector(INTSXP, n));
     int *p = INTEGER(val);
     for (int i = 0; i < n; i++) p[i] = v;
     R_set_altrep_data2(vec, val);
     UNPROTECT(1);
-    return DATAPTR(val);
+    return INTEGER(val);
   }
 
   static void* DataptrReal(SEXP vec, Rboolean writeable)
   {
     SEXP data2 = R_altrep_data2(vec);
-    if (data2 != R_NilValue)
-    {
-      //Rprintf("Returning pointer to materialized compact_repetition at %p\n", R_ExternalPtrAddr(vec));
-      return DATAPTR(data2);
+    if (data2 != R_NilValue) {
+      return REAL(data2);
     }
 
-    //Rprintf("Materializing a compact repetition at %p\n", R_ExternalPtrAddr(vec));
     int n = Length(vec);
     double v = Get(vec).value;
     SEXP val = PROTECT(Rf_allocVector(REALSXP, n));
     double *p = REAL(val);
     for (int i = 0; i < n; i++) p[i] = v;
     R_set_altrep_data2(vec, val);
     UNPROTECT(1);
-    return DATAPTR(val);
+    return REAL(val);
   }
 
   static void* DataptrLogical(SEXP vec, Rboolean writeable)
   {
     SEXP data2 = R_altrep_data2(vec);
-    if (data2 != R_NilValue)
-    {
-      //Rprintf("Returning pointer to materialized compact_repetition at %p\n", R_ExternalPtrAddr(vec));
-      return DATAPTR(data2);
+    if (data2 != R_NilValue) {
+      return LOGICAL(data2);
     }
 
-    //Rprintf("Materializing a compact repetition at %p\n", R_ExternalPtrAddr(vec));
     int n = Length(vec);
     bool v = Get(vec).value;
     SEXP val = PROTECT(Rf_allocVector(LGLSXP, n));
     int *p = LOGICAL(val);
     for (int i = 0; i < n; i++) p[i] = v ? TRUE : FALSE;
     R_set_altrep_data2(vec, val);
     UNPROTECT(1);
-    return DATAPTR(val);
+    return LOGICAL(val);
   }
 
+
   // ALTINT methods -----------------
   // the element at the index `i`
   // this does not do bounds checking because that's expensive, so