[pdal-commits] [PDAL/PDAL] 2f6c6f: Update to allow merge.

Thu Jun 12 13:52:54 PDT 2014

  Branch: refs/heads/point-context
  Home:   https://github.com/PDAL/PDAL
  Commit: 2f6c6f0cda0ed351a3440cba33bc3abbbeb52f3f
      https://github.com/PDAL/PDAL/commit/2f6c6f0cda0ed351a3440cba33bc3abbbeb52f3f
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M include/pdal/Filter.hpp
    M include/pdal/Metadata.hpp
    M include/pdal/MultiFilter.hpp
    M include/pdal/PipelineWriter.hpp
    M include/pdal/PointBuffer.hpp
    M include/pdal/PointContext.hpp
    M include/pdal/Reader.hpp
    M include/pdal/Stage.hpp
    M include/pdal/Writer.hpp
    M include/pdal/drivers/bpf/BpfReader.hpp
    M include/pdal/drivers/faux/Reader.hpp
    M include/pdal/drivers/las/Reader.hpp
    M include/pdal/drivers/las/Writer.hpp
    M include/pdal/drivers/nitf/Reader.hpp
    M include/pdal/drivers/oci/OciReader.hpp
    M include/pdal/drivers/oci/Writer.hpp
    M include/pdal/drivers/pgpointcloud/Reader.hpp
    M include/pdal/drivers/pgpointcloud/Writer.hpp
    M include/pdal/drivers/sbet/Reader.hpp
    M include/pdal/drivers/sbet/Writer.hpp
    M include/pdal/filters/ByteSwap.hpp
    M include/pdal/filters/Cache.hpp
    M include/pdal/filters/Colorization.hpp
    M include/pdal/filters/Crop.hpp
    M include/pdal/filters/Decimation.hpp
    M include/pdal/filters/Mosaic.hpp
    M include/pdal/filters/Predicate.hpp
    M include/pdal/filters/Programmable.hpp
    M include/pdal/filters/Scaling.hpp
    M include/pdal/filters/Splitter.hpp
    M include/pdal/filters/Stats.hpp
    M include/pdal/kernel/Info.hpp
    M src/Filter.cpp
    M src/Metadata.cpp
    M src/MultiFilter.cpp
    M src/PipelineWriter.cpp
    M src/PointBuffer.cpp
    M src/Reader.cpp
    M src/Stage.cpp
    M src/Writer.cpp
    M src/drivers/bpf/BpfReader.cpp
    M src/drivers/faux/Reader.cpp
    M src/drivers/las/Reader.cpp
    M src/drivers/las/Writer.cpp
    M src/drivers/nitf/NitfFile.cpp
    M src/drivers/nitf/NitfFile.hpp
    M src/drivers/nitf/Reader.cpp
    M src/drivers/oci/OciReader.cpp
    M src/drivers/oci/Writer.cpp
    M src/drivers/pgpointcloud/Reader.cpp
    M src/drivers/pgpointcloud/Writer.cpp
    M src/drivers/sbet/Reader.cpp
    M src/drivers/sbet/Writer.cpp
    M src/filters/ByteSwap.cpp
    M src/filters/Cache.cpp
    M src/filters/Colorization.cpp
    M src/filters/Crop.cpp
    M src/filters/Decimation.cpp
    M src/filters/InPlaceReprojection.cpp
    M src/filters/Mosaic.cpp
    M src/filters/Predicate.cpp
    M src/filters/Programmable.cpp
    M src/filters/Scaling.cpp
    M src/filters/Splitter.cpp
    M src/filters/Stats.cpp
    M src/kernel/Diff.cpp
    M src/kernel/Info.cpp
    M src/kernel/Pipeline.cpp
    M test/unit/MetadataTest.cpp
    M test/unit/StageTester.hpp
    M test/unit/XMLSchemaTest.cpp
    M test/unit/drivers/bpf/BPFTest.cpp
    M test/unit/drivers/las/LasReaderTest.cpp
    M test/unit/drivers/las/LasWriterTest.cpp
    M test/unit/drivers/pgpointcloud/Support.hpp.in
    M test/unit/filters/InPlaceReprojectionFilterTest.cpp
    M test/unit/filters/SelectorFilterTest.cpp

  Log Message:
  -----------
  Update to allow merge.


  Commit: 60e31d83da74c9487493020d6c74e8526edb7176
      https://github.com/PDAL/PDAL/commit/60e31d83da74c9487493020d6c74e8526edb7176
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M include/pdal/Bounds.hpp
    M include/pdal/Schema.hpp
    M include/pdal/SpatialReference.hpp
    M include/pdal/drivers/las/Reader.hpp
    M include/pdal/drivers/las/Writer.hpp
    M include/pdal/drivers/nitf/Reader.hpp
    M include/pdal/drivers/nitf/Writer.hpp
    M include/pdal/drivers/oci/common.hpp
    M include/pdal/filters/Stats.hpp
    M include/pdal/kernel/Info.hpp
    M scripts/ci/before_install.sh
    M scripts/ci/common.sh
    M scripts/ci/script.sh
    M src/SpatialReference.cpp
    M src/StageFactory.cpp
    M src/drivers/las/Reader.cpp
    M src/drivers/las/Writer.cpp
    M src/drivers/nitf/Reader.cpp
    M src/drivers/nitf/Writer.cpp
    M src/drivers/oci/OciReader.cpp
    M src/drivers/oci/OciSeqIterator.cpp
    M src/drivers/oci/common.cpp
    M src/filters/InPlaceReprojection.cpp
    M src/filters/Stats.cpp
    M src/kernel/Info.cpp
    M test/unit/CMakeLists.txt
    M test/unit/SpatialReferenceTest.cpp
    M test/unit/drivers/nitf/NitfReaderTest.cpp
    M test/unit/drivers/nitf/NitfWriterTest.cpp

  Log Message:
  -----------
  Merge branch 'point-context' of https://github.com/PDAL/PDAL into point-context

Conflicts:
	include/pdal/drivers/las/Reader.hpp
	include/pdal/drivers/nitf/Reader.hpp
	include/pdal/filters/Stats.hpp
	src/drivers/nitf/Reader.cpp
	src/filters/Stats.cpp
	src/kernel/Info.cpp


  Commit: 969e1bf8fc149a8c35e5a4ed40b814a548153e6c
      https://github.com/PDAL/PDAL/commit/969e1bf8fc149a8c35e5a4ed40b814a548153e6c
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M include/pdal/Filter.hpp
    M include/pdal/Metadata.hpp
    M include/pdal/MultiFilter.hpp
    M include/pdal/PipelineWriter.hpp
    M include/pdal/Reader.hpp
    M include/pdal/Schema.hpp
    M include/pdal/Stage.hpp
    M include/pdal/Writer.hpp
    M include/pdal/XMLSchema.hpp
    M include/pdal/drivers/las/Reader.hpp
    M include/pdal/drivers/las/Writer.hpp
    M src/Filter.cpp
    M src/Metadata.cpp
    M src/MultiFilter.cpp
    M src/PipelineWriter.cpp
    M src/Reader.cpp
    M src/Schema.cpp
    M src/Stage.cpp
    M src/StageInfo.cpp
    M src/Writer.cpp
    M src/XMLSchema.cpp
    M src/drivers/las/Reader.cpp
    M src/drivers/las/Writer.cpp
    M src/drivers/pgpointcloud/Writer.cpp
    M src/filters/InPlaceReprojection.cpp
    M src/kernel/Diff.cpp
    M src/kernel/Info.cpp
    M test/unit/MetadataTest.cpp
    M test/unit/XMLSchemaTest.cpp
    M test/unit/filters/InPlaceReprojectionFilterTest.cpp

  Log Message:
  -----------
  New metadata implementation.


  Commit: f079fb1ebb8d01a8152315b79fd2666d006344be
      https://github.com/PDAL/PDAL/commit/f079fb1ebb8d01a8152315b79fd2666d006344be
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M src/drivers/las/Writer.cpp
    M test/unit/MetadataTest.cpp

  Log Message:
  -----------
  Fix findVlr.  Add vlr metadata test.


  Commit: bd95e1a32eec4179727fa7f1de6f62a38b069668
      https://github.com/PDAL/PDAL/commit/bd95e1a32eec4179727fa7f1de6f62a38b069668
  Author: Andrew Bell <andrew.bell.ia at gmail.com>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M include/pdal/Stage.hpp
    M include/pdal/drivers/bpf/BpfReader.hpp
    M include/pdal/drivers/faux/Reader.hpp
    M include/pdal/drivers/las/Reader.hpp
    M include/pdal/drivers/las/Writer.hpp
    M include/pdal/drivers/nitf/Reader.hpp
    M include/pdal/drivers/oci/OciReader.hpp
    M include/pdal/drivers/oci/Writer.hpp
    M include/pdal/drivers/pgpointcloud/Reader.hpp
    M include/pdal/drivers/pgpointcloud/Writer.hpp
    M include/pdal/drivers/sbet/Reader.hpp
    M include/pdal/drivers/sbet/Writer.hpp
    M include/pdal/filters/ByteSwap.hpp
    M include/pdal/filters/Colorization.hpp
    M include/pdal/filters/Crop.hpp
    M include/pdal/filters/Decimation.hpp
    M include/pdal/filters/Mosaic.hpp
    M include/pdal/filters/Predicate.hpp
    M include/pdal/filters/Programmable.hpp
    M include/pdal/filters/Scaling.hpp
    M include/pdal/filters/Splitter.hpp
    M src/Stage.cpp
    M src/drivers/bpf/BpfReader.cpp
    M src/drivers/faux/Reader.cpp
    M src/drivers/las/Reader.cpp
    M src/drivers/las/Writer.cpp
    M src/drivers/nitf/Reader.cpp
    M src/drivers/oci/OciReader.cpp
    M src/drivers/oci/Writer.cpp
    M src/drivers/pgpointcloud/Reader.cpp
    M src/drivers/pgpointcloud/Writer.cpp
    M src/drivers/sbet/Reader.cpp
    M src/drivers/sbet/Writer.cpp
    M src/filters/ByteSwap.cpp
    M src/filters/Colorization.cpp
    M src/filters/Crop.cpp
    M src/filters/Decimation.cpp
    M src/filters/Mosaic.cpp
    M src/filters/Predicate.cpp
    M src/filters/Programmable.cpp
    M src/filters/Scaling.cpp
    M src/filters/Splitter.cpp
    M test/unit/StageTester.hpp

  Log Message:
  -----------
  Remove PointContext argument from initialize()


Compare: https://github.com/PDAL/PDAL/compare/f1fa1b1f64fa...bd95e1a32eec