Skip to content

Commit

Permalink
Merge branch 'issue50'
Browse files Browse the repository at this point in the history
# Conflicts:
#	NEWS.md
  • Loading branch information
Jean-Romain committed Mar 17, 2021
2 parents a49e586 + 61575e2 commit 0699df8
Show file tree
Hide file tree
Showing 119 changed files with 11,438 additions and 2,034 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Description: Read and write 'las' and 'laz' binary file formats. The LAS file fo
URL: https://github.com/Jean-Romain/rlas
BugReports: https://github.com/Jean-Romain/rlas/issues
License: GPL-3
Depends: R (>= 3.0.0)
Depends: R (>= 3.4.0)
Imports: Rcpp, data.table
LazyData: true
RoxygenNote: 7.1.1
Expand Down
96 changes: 0 additions & 96 deletions inst/include/LICENSE.txt

This file was deleted.

19 changes: 0 additions & 19 deletions inst/include/README.txt

This file was deleted.

77 changes: 0 additions & 77 deletions inst/include/lasunzipper.hpp

This file was deleted.

77 changes: 0 additions & 77 deletions inst/include/laszipper.hpp

This file was deleted.

14 changes: 8 additions & 6 deletions laslib2R.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,28 @@ perl -pi -w -e 's/exit\(1\)/throw std::runtime_error\("Internal error"\)/g;' $fi

# fopen_compressed.cpp #include <R.h> and #define STRICT_R_HEADERS
# mydefs.hpp #include <R.h> and #define STRICT_R_HEADERS
# lasreaderpipeon.cpp l96-101 comment lines
# laswriter.cpp l135-199 comment lines
# lasreaderpipeon.cpp l96-101 comment lines because of stdout
# laswriter.cpp l139-204 comment lines because of stdout (I guess)
# laswriter.cpp l1130,1135 for gcc 8+ replace strncpy by memcpy
# lasattributer.hpp l79-80 for gcc 8+ replace strncpy by memcpy - requires to get the char* length:
# int len = 0 ; while(*(description+len) != '\0' && len < 32) len++;
# memcpy(this->description, description, len);
# lasdefinition.hpp l570 cast to void* : memset((void*)&(vlrs[i]), 0, sizeof(LASvlr));
# lasdefinition.hpp l572,697 for gcc 8+ replace strncpy by memcpy in the same way than lasattributer.hpp
# laswriter_bin.cpp l173 for gcc 8+ replace strncpy by memcpy
# bytestreamount_file.hpp l134 return (true)
# lastransform.cpp l401 R::runif(0, RAND_MAX);
# lasfilter.cpp l1298 R::runif(0, RAND_MAX);
# bytestreamount_file.hpp l134 return (true) to get rid of stdout
# lastransform.cpp l584 R::runif(0, RAND_MAX);
# lasfilter.cpp l1310 R::runif(0, RAND_MAX);
# lasutility.cpp #include <stdexcept>
# lasinterval.cpp l545 delete ((LASintervalStartCell*)previous_cell); for gcc-asan fix in lax files
# lasinterval.cpp l552 delete ((LASintervalStartCell*)previous_cell); for gcc-asan fix in lax files
# lasquadtree.cpp l1662 for interger overflow
# if (l < 16)
# level_offset[l+1] = level_offset[l] + ((1<<l)*(1<<l));
# else
# level_offset[l+1] = level_offset[l];
# bytestreamin_file.hpp l153,166 off_t -> off64_t (see #50)
# bytestreamout_file.hpp l152,163 off_t -> off64_t (see #50)
# lasreader.cpp l1875,1880 add (min_y != 0 || max_y != 0) to allow -inside 0 0 0 0 in lidR
# CRAN is happy now!

# In addition:
Expand Down
6 changes: 6 additions & 0 deletions src/LASlib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Release
Debug
LASlib.ncb
LASlib.opt
LASlib.plg
*~
Loading

0 comments on commit 0699df8

Please sign in to comment.