Skip to content

Commit

Permalink
#18 disable GeoAsciiParamsTag and WKT OGC MATH TRANSFORM.
Browse files Browse the repository at this point in the history
This is expected to fix gcc ASAN error


Former-commit-id: d9968d6
  • Loading branch information
Jean-Romain committed Apr 11, 2018
1 parent 5b9e355 commit ce0be30
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
9 changes: 9 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
This is an early release because ASAN and USBAN raised additionnal error.

* clang ASAN/USBAN: the code now ensures that NAs will no be casted to int
* gcc ASAN: I disable minor features because I was not able to fix this error

To be honnest I can't swear that these additional errors are fixed because I was not able
to reproduce. I try to reproduce with `rhub::check_with_sanitizer()` but tests were ok.
I have not been able to compile with sanitizer myself. Thus I only guess the error are fixed.

## Test environments
* Linux Mint 18 (Ubuntu 16.04), R 3.4.4, g++ -std=gnu++11
* Linux Mint 18 (Ubuntu 16.04), R 3.4.4, g++-7 -std=gnu++11
Expand Down
9 changes: 6 additions & 3 deletions src/readheader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,19 +212,22 @@ List vlrsreader(LASheader* lasheader)
}
else if (vlr.record_id == 34737) // GeoAsciiParamsTag
{
lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)));
//lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)))
lvlr.push_back("The reading of this information is not yet supported by rlas");
lvlrnames.push_back("tags");
lvlrsnames.push_back("GeoAsciiParamsTag");
}
else if (vlr.record_id == 2111) // WKT OGC MATH TRANSFORM
{
lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)));
//lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)))
lvlr.push_back("The reading of this information is not yet supported by rlas");
lvlrnames.push_back("WKT OGC MATH TRANSFORM");
lvlrsnames.push_back("WKT OGC MT");
}
else if (vlr.record_id == 2112) // WKT OGC COORDINATE SYSTEM
{
lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)));
//lvlr.push_back(std::string(reinterpret_cast< char const* >(vlr.data)))
lvlr.push_back("The reading of this information is not yet supported by rlas");
lvlrnames.push_back("WKT OGC COORDINATE SYSTEM");
lvlrsnames.push_back("WKT OGC CS");
}
Expand Down

0 comments on commit ce0be30

Please # to comment.