Don't add ClassFlags/ScanChannel unless we're processing pointformat …

…6-10.
PDAL · May 25, 2020 · 1728c95 · 1728c95
1 parent 1a3215d
commit 1728c95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/io/LasReader.cpp b/io/LasReader.cpp
@@ -555,7 +555,7 @@ void LasReader::addDimensions(PointLayoutPtr layout)
     }
     if (m_header.hasInfrared())
         layout->registerDim(Id::Infrared);
-    if (m_header.versionAtLeast(1, 4))
+    if (m_header.has14Format())
     {
         layout->registerDim(Id::ScanChannel);
         layout->registerDim(Id::ClassFlags);

diff --git a/test/unit/io/LasReaderTest.cpp b/test/unit/io/LasReaderTest.cpp
@@ -281,7 +281,7 @@ TEST(LasReaderTest, extraBytes)
     reader.prepare(table);
 
     DimTypeList dimTypes = layout->dimTypes();
-    EXPECT_EQ(dimTypes.size(), (size_t)24);
+    EXPECT_EQ(dimTypes.size(), (size_t)22);
 
     Dimension::Id color0 = layout->findProprietaryDim("Colors0");
     EXPECT_EQ(layout->dimType(color0), Dimension::Type::Unsigned16);