forked from PointCloudLibrary/pcl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'gh/master' into robust-mean-and-covaria…
…nce-estimate * gh/master: (166 commits) Fixes for issue PointCloudLibrary#924 Fix setSize () in PCL visualizer PCL formula is in the official homebrew repo CMake pkg_check_modules sets GLEW_INCLUDEDIR Fix for Mac OS X Changes necessary for lccp pull request PointCloudLibrary#718 Change to visualization to make things a bit nicer - mainly removed broken opacity Updated supervoxel examples with normals and better description of the camera transform Removed public interface for modifying neighbors of OctreePointcloudAdjacencyContainer. Neighbors can now only be added/removed from within OctreePointcloudAdjacency. This does *not* mean neighbors can't be modified, just that the list of neighbors itself can't be modified. Fix for problem where leaves could get lost, and warning would show up. Now we use leaf indices directly for seeding, instead of doing a look up Changed OctreePointcloud Adjacency to use std::list instead of std::set, added comparator to SupervoxelHelper so that the internal set of voxels owned by a helper is sorted by index instead of memory location Added brief comment explaining comparator Fix inconsistency between method declaration and implementation that resulted in build failure Remove Boost Chrono dependency Don't normalize path if function is not in Boost Disable precompilation of PPFRegistration Fix for issue PointCloudLibrary#758 Moved pcl::PPFHashMapSearch::setInputFeatureCloud() and pcl::PPFHashMapSearch::nearestNeighborSearch() implementation from ppf_registration.hpp to ppf_registration.cpp since they belong to a not templated class Bump PCL version to 1.8.0 Fixes PointCloudLibrary#896. Add a changelist for 1.7.2 Set PCL_ONLY_CORE_POINT_TYPES on Windows (Closes PointCloudLibrary#833) ... Conflicts: common/include/pcl/common/impl/centroid.hpp
- Loading branch information
Showing
252 changed files
with
7,196 additions
and
31,334 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,11 +84,15 @@ function doc () | |
| # Do not generate documentation for pull requests | ||
| if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then exit; fi | ||
| # Install doxygen and sphinx | ||
| sudo apt-get install doxygen doxygen-latex graphviz python-pip | ||
| sudo apt-get install doxygen doxygen-latex graphviz python-pip texlive-latex-base dvipng | ||
| sudo pip install sphinx sphinxcontrib-doxylink | ||
| # Configure | ||
| mkdir $BUILD_DIR && cd $BUILD_DIR | ||
| cmake $PCL_DIR | ||
| cmake -DDOXYGEN_USE_SHORT_NAMES=OFF \ | ||
| -DSPHINX_HTML_FILE_SUFFIX=php \ | ||
| -DWITH_DOCS=1 \ | ||
| -DWITH_TUTORIALS=1 \ | ||
| $PCL_DIR | ||
|
|
||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "PointCloudLibrary (via TravisCI)" | ||
|
|
@@ -105,17 +109,23 @@ function doc () | |
| cd $DOC_DIR | ||
| git clone [email protected]:PointCloudLibrary/documentation.git . | ||
|
|
||
| # Generate documentation | ||
| cd $BUILD_DIR | ||
| make doc | ||
| cd $DOC_DIR | ||
| git commit -a -m "adding $TRAVIS_COMMIT" | ||
| git push | ||
|
|
||
| # Generate tutorials | ||
| # Generate documentation and tutorials | ||
| cd $BUILD_DIR | ||
| make tutorials | ||
| # upload to github... | ||
| make doc tutorials advanced | ||
|
|
||
| # Upload to GitHub if generation succeeded | ||
| if [[ $? == 0 ]]; then | ||
| # Copy generated tutorials to the doc directory | ||
| cp -r $TUTORIALS_DIR/* $DOC_DIR/tutorials | ||
| cp -r $ADVANCED_DIR/* $DOC_DIR/advanced | ||
| # Commit and push | ||
| cd $DOC_DIR | ||
| git add --all | ||
| git commit --amend -m "Documentation for commit $TRAVIS_COMMIT" | ||
| git push --force | ||
| else | ||
| exit 2 | ||
| fi | ||
| } | ||
|
|
||
| case $TASK in | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.