Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed Feb 8, 2018
2 parents de02dd5 + e304603 commit e71ea6b
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -6,10 +6,10 @@ sudo: required
services: docker

before_install:
- docker pull alpine:3.6
- docker pull alpine:3.7

script:
- docker run -v $TRAVIS_BUILD_DIR:/pdal -t alpine:3.6 /bin/sh -c "/pdal/scripts/ci/script.sh"
- docker run -v $TRAVIS_BUILD_DIR:/pdal -t alpine:3.7 /bin/sh -c "/pdal/scripts/ci/script.sh"

after_success:
- echo "secure travis:" "$TRAVIS_SECURE_ENV_VARS"
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions doc/project/contributors.rst
Expand Up @@ -52,7 +52,7 @@ capabilities to the PDAL project, including :ref:`Poisson sampling
Funding Contributors
--------------------------------------------------------------------------------

.. image:: ./rsgis_logo.png
.. image:: ../development/rsgis_logo.png
:target: http://www.erdc.usace.army.mil/Locations/CRREL.aspx

The US Army Corps of Engineers Remote Sensing / GIS Center of Expertise at
Expand All @@ -61,10 +61,10 @@ management systems. `CRREL`_'s `GRiD`_ project manages LiDAR and point cloud
data for a multitude of U.S. Army Corps missions. Find out more about GRiD in
this `LiDAR Magazine article`_.

.. image:: ./nsf1.png
.. image:: ../development/nsf1.png
:target: http://www.nsf.gov

.. image:: ./uoh.png
.. image:: ../development/uoh.png
:target: http://www.uh.edu

`NSF <http://www.nsf.gov>`_, in collaboration with `Dr. Craig Glennie
Expand Down
4 changes: 2 additions & 2 deletions doc/project/docker.rst
Expand Up @@ -21,8 +21,8 @@ building of `Docker`_ containers. PDAL keeps three Docker containers current.

.. note::

Containers are built upon the `Dependences`_ container, but the
`Dependences`_ container is not pinned to specific Xenial or PDAL release
Containers are built upon the `Dependencies`_ container, but the
`Dependencies`_ container is not pinned to specific Xenial or PDAL release
times. It corresponds to where ever the ``dependencies`` tag of the PDAL
source tree at https://github.com/PDAL/PDAL resides

Expand Down
22 changes: 22 additions & 0 deletions doc/project/index.rst
@@ -0,0 +1,22 @@
.. _project:

******************************************************************************
Project
******************************************************************************


Project resources, such as how to update the docs, where the test
frameworks are, who develops the software, and conventions to use when
developing new code can be found in this section.

.. toctree::
:maxdepth: 2

conventions
contributors
docs
docker
alpine
testing
integration

21 changes: 2 additions & 19 deletions doc/tutorial/index.rst
Expand Up @@ -19,25 +19,8 @@ This section provides a collection of tutorials on how to use the PDAL
reading
las
pcl_block_tutorial
pcl_ground
clipping-with-shapefile
calculating-normalized-heights
dart-throwing
pcl_ground/index
clipping/index
ground-filters


Developing
----------

.. toctree::
:maxdepth: 1

writing-filter
writing-kernel
writing-reader
writing-writer
liblas_to_pdal
pcl_ground/index
clipping/index
sampling/index
python-filtering
2 changes: 1 addition & 1 deletion io/OGRWriterV1.cpp
Expand Up @@ -58,7 +58,7 @@ static PluginInfo const s_info = PluginInfo(
"http://pdal.io/stages/writers.ogr.html");


CREATE_STATIC_PLUGIN(1, 0, OGRWriter, Writer, s_info);
CREATE_STATIC_PLUGIN(1, 0, OGRWriter, Writer, s_info)

OGRWriter::OGRWriter() : m_driver(nullptr), m_ds(nullptr), m_layer(nullptr),
m_feature(nullptr)
Expand Down
1 change: 1 addition & 0 deletions test/unit/ConfigTest.cpp
Expand Up @@ -34,6 +34,7 @@

#include <pdal/pdal_test_main.hpp>

#include <pdal/pdal_features.hpp>
#include <pdal/pdal_config.hpp>

using namespace pdal;
Expand Down

0 comments on commit e71ea6b

Please sign in to comment.