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 Jul 25, 2018
2 parents 884865f + adcd360 commit 9693732
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
17 changes: 14 additions & 3 deletions doc/stages/filters.python.rst
Expand Up @@ -44,8 +44,19 @@ filter and the ``outs`` array represents the points after filtering.



2) If you want to write a dimension that might not be available, use can use one
or more ``add_dimension`` options.
2) If you want write a dimension that might not be available, you can specify
it with the ``add_dimension`` option.

.. code-block:: json
"add_dimension": "NewDimensionOne"
To create more than one dimension, this option also accepts an array.

.. code-block:: json
"add_dimension": [ "NewDimensionOne", "NewDimensionTwo", "NewDimensionThree" ]
.. note::

Expand Down Expand Up @@ -265,7 +276,7 @@ source
The literal `Python`_ code to execute, when the script option is not being used.

add_dimension
The name of a dimension to add to the pipeline that does not already exist.
A dimension name or an array of dimension names to add to the pipeline that do not already exist.

pdalargs
A JSON dictionary of items you wish to pass into the modules globals as the
Expand Down
12 changes: 6 additions & 6 deletions plugins/python/plang/Environment.cpp
Expand Up @@ -190,9 +190,9 @@ std::string getTraceback()
throw pdal::pdal_error("unable to get repr in getTraceback");
#if PY_MAJOR_VERSION >= 3
Py_ssize_t size;
char *d = PyUnicode_AsUTF8AndSize(r, &size);
const char *d = PyUnicode_AsUTF8AndSize(r, &size);
#else
char *d = PyString_AsString(r);
const char *d = PyString_AsString(r);
#endif
mssg << d;
}
Expand All @@ -208,9 +208,9 @@ std::string getTraceback()
throw pdal::pdal_error("couldn't make string representation of traceback value");
#if PY_MAJOR_VERSION >= 3
Py_ssize_t size;
char *d = PyUnicode_AsUTF8AndSize(r, &size);
const char *d = PyUnicode_AsUTF8AndSize(r, &size);
#else
char *d = PyString_AsString(r);
const char *d = PyString_AsString(r);
#endif
mssg << d;
}
Expand Down Expand Up @@ -266,9 +266,9 @@ std::string readPythonString(PyObject* dict, const std::string& key)
throw pdal::pdal_error("unable to get repr in readPythonString");
#if PY_MAJOR_VERSION >= 3
Py_ssize_t size;
char *d = PyUnicode_AsUTF8AndSize(r, &size);
const char *d = PyUnicode_AsUTF8AndSize(r, &size);
#else
char *d = PyString_AsString(r);
const char *d = PyString_AsString(r);
#endif
ss << d;

Expand Down

0 comments on commit 9693732

Please sign in to comment.