slightly botched merge in 3d08a98

PDAL · Jan 12, 2016 · 0497bb4 · 0497bb4
1 parent 3d08a98
commit 0497bb4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/io/las/GeotiffSupport.cpp b/io/las/GeotiffSupport.cpp
@@ -35,13 +35,14 @@
 #include "GeotiffSupport.hpp"
 
 // GDAL
+#include <geo_simpletags.h>
 #include <geo_normalize.h>
 #include <ogr_spatialref.h>
+#include <cpl_conv.h>
 
 #include <sstream>
 
 PDAL_C_START
-#ifdef __geotiff_h_
 
 // These functions are available from GDAL, but they
 // aren't exported.

diff --git a/io/las/LasReader.cpp b/io/las/LasReader.cpp
@@ -583,7 +583,6 @@ void LasReader::addDimensions(PointLayoutPtr layout)
     if (m_lasHeader.versionAtLeast(1, 4))
     {
         layout->registerDim(Id::ScanChannel);
-        layout->registerDim(Id::ClassFlags);
     }
 
     for (auto& dim : m_extraDims)