Skip to content

Commit 87f1290

Browse files
committed
Fix dimName calls to be better, otherwise CSV reads wont work
1 parent de3a4e3 commit 87f1290

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "pdal-jni"
22

33
lazy val commonSettings = Seq(
4-
version := "1.8.1" + Environment.versionSuffix,
4+
version := "1.8.2" + Environment.versionSuffix,
55
scalaVersion := "2.11.12",
66
crossScalaVersions := Seq("2.12.8", "2.11.12"),
77
organization := "io.pdal",

native/src/io_pdal_PointLayout.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ JNIEXPORT jobjectArray JNICALL Java_io_pdal_PointLayout_dimTypes
5555
for (long i = 0; i < static_cast<long>(dimTypes.size()); i++)
5656
{
5757
auto dt = dimTypes.at(i);
58-
jstring id = env->NewStringUTF(pdal::Dimension::name(dt.m_id).c_str());
58+
jstring id = env->NewStringUTF(pl->dimName(dt.m_id).c_str());
5959
jstring type = env->NewStringUTF(pdal::Dimension::interpretationName(dt.m_type).c_str());
6060
jobject element = env->NewObject(dtClass, dtCtor, id, type, dt.m_xform.m_scale.m_val, dt.m_xform.m_offset.m_val);
6161

@@ -75,7 +75,7 @@ JNIEXPORT jobject JNICALL Java_io_pdal_PointLayout_findDimType
7575
std::string fid = std::string(env->GetStringUTFChars(jstr, 0));
7676
PointLayout *pl = getHandle<PointLayout>(env, obj);
7777
DimType dt = pl->findDimType(fid);
78-
jstring id = env->NewStringUTF(pdal::Dimension::name(dt.m_id).c_str());
78+
jstring id = env->NewStringUTF(pl->dimName(dt.m_id).c_str());
7979
jstring type = env->NewStringUTF(pdal::Dimension::interpretationName(dt.m_type).c_str());
8080

8181
jclass dtClass = env->FindClass("io/pdal/DimType");
@@ -103,7 +103,7 @@ JNIEXPORT jlong JNICALL Java_io_pdal_PointLayout_dimPackedOffset
103103
DimTypeList dims = pl->dimTypes();
104104

105105
auto it = std::find_if(dims.begin(), dims.end(), [&dimType](const DimType& dt) {
106-
return pdal::Dimension::name(dt.m_id) == pdal::Dimension::name(dimType.m_id);
106+
return pl->dimName(dt.m_id) == pl->dimName(dimType.m_id);
107107
});
108108
auto index = std::distance(dims.begin(), it);
109109
long offset = 0;

0 commit comments

Comments
 (0)