Skip to content

Commit d837b0a

Browse files
committed
catch up to PDAL 2.8.0 updates
1 parent 066ab0c commit d837b0a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies = [
2929
"numpy >= 1.22"
3030
]
3131

32-
version="1.5.2"
32+
version="1.6.0"
3333

3434
[project.optional-dependencies]
3535
test = [ ]

src/pdal/plang/Invocation.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,19 +365,20 @@ PyObject* getPyJSON(std::string const& s)
365365
PyObject *Invocation::prepareData(PointViewPtr& view)
366366
{
367367
gil_scoped_acquire acquire;
368-
PointLayoutPtr layout(view->m_pointTable.layout());
368+
PointLayoutPtr layout(view->table().layout());
369369
Dimension::IdList const& dims = layout->dims();
370370

371371
PyObject *arrays = PyDict_New();
372372
for (auto di = dims.begin(); di != dims.end(); ++di)
373373
{
374374
Dimension::Id d = *di;
375375
const Dimension::Detail *dd = layout->dimDetail(d);
376+
Dimension::Type dimType = view->dimType(d);
376377
void *data = malloc(dd->size() * view->size());
377378
char *p = (char *)data;
378379
for (PointId idx = 0; idx < view->size(); ++idx)
379380
{
380-
view->getFieldInternal(d, idx, (void *)p);
381+
view->getField((char*)p, d, dimType, idx);
381382
p += dd->size();
382383
}
383384
std::string name = layout->dimName(*di);
@@ -444,7 +445,7 @@ void Invocation::extractData(PointViewPtr& view, PyObject *arrays)
444445

445446
StringList names = dictKeys(arrays);
446447

447-
PointLayoutPtr layout(view->m_pointTable.layout());
448+
PointLayoutPtr layout(view->table().layout());
448449

449450
for (auto& name : names)
450451
if (layout->findDim(name) == Dimension::Id::Unknown)

0 commit comments

Comments
 (0)