[python-pdal] 03/11: Imported Upstream version 1.1.0+ds

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository python-pdal.

commit 95d7c669ddcfea417b73c7d9ec6186b467447840
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 19 22:09:17 2016 +0100

    Imported Upstream version 1.1.0+ds
---
 PKG-INFO          |  2 +-
 VERSION.txt       |  2 +-
 pdal/Pipeline.hpp | 40 ++++++++++++++++++++++++++++++++++++++++
 pdal/__init__.py  |  2 +-
 setup.py          |  4 ++--
 5 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 2c2ad67..b1276c7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: PDAL
-Version: 1.0.0
+Version: 1.1.0
 Summary: Point cloud data processing
 Home-page: http://pdal.io
 Author: Howard Butler
diff --git a/VERSION.txt b/VERSION.txt
index afaf360..1cc5f65 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.0.0
\ No newline at end of file
+1.1.0
\ No newline at end of file
diff --git a/pdal/Pipeline.hpp b/pdal/Pipeline.hpp
new file mode 100644
index 0000000..38a640e
--- /dev/null
+++ b/pdal/Pipeline.hpp
@@ -0,0 +1,40 @@
+#include <pdal/PipelineReader.hpp>
+#include <pdal/PipelineManager.hpp>
+#include <pdal/PipelineWriter.hpp>
+#include <pdal/util/FileUtils.hpp>
+#include <pdal/plang/Array.hpp>
+
+#include <string>
+#include <Python.h>
+#undef toupper
+#undef tolower
+#undef isspace
+
+#define PY_ARRAY_UNIQUE_SYMBOL LIBPDALPYTHON_ARRAY_API
+#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
+
+#include <numpy/arrayobject.h>
+
+
+namespace libpdalpython
+{
+//     typedef std::shared_ptr<pdal::plang::Array> PArray;
+    typedef pdal::plang::Array* PArray;
+class Pipeline {
+public:
+    Pipeline(std::string const& xml);
+    ~Pipeline(){};
+
+    void execute();
+    inline const char* getXML() const { return m_xml.c_str(); }
+    inline const char* getSchema() const { return m_schema.c_str(); }
+    std::vector<PArray> getArrays() const;
+
+private:
+    std::string m_xml;
+    std::string m_schema;
+    pdal::PipelineManager m_manager; // no progress reporting
+
+};
+
+}
diff --git a/pdal/__init__.py b/pdal/__init__.py
index a5675f6..1ab67ec 100644
--- a/pdal/__init__.py
+++ b/pdal/__init__.py
@@ -1 +1 @@
-__version__='1.0.0'
+__version__='1.1.0'
diff --git a/setup.py b/setup.py
index 41f5fa7..7883b02 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 #
 # PDAL_LIBRARY_PATH: a path to a PDAL C++ shared library.
 #
-# GEOS_CONFIG: the path to a pdal-config program that points to GEOS version,
+# PDAL_CONFIG: the path to a pdal-config program that points to PDAL version,
 # headers, and libraries.
 #
 # NB: within this setup scripts, software versions are evaluated according
@@ -40,7 +40,7 @@ if 'all' in sys.warnoptions:
 
 # Second try: use PDAL_CONFIG environment variable
 if 'PDAL_CONFIG' in os.environ:
-    pdal_config = os.environ['GEOS_CONFIG']
+    pdal_config = os.environ['PDAL_CONFIG']
     log.debug('pdal_config: %s', pdal_config)
 else:
     pdal_config = 'pdal-config'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-pdal.git