[Liblas-commits] r1251 - in trunk: apps include/liblas src
liblas-commits at liblas.org
liblas-commits at liblas.org
Mon May 4 13:16:55 EDT 2009
Author: hobu
Date: Mon May 4 13:16:55 2009
New Revision: 1251
URL: http://liblas.org/changeset/1251
Log:
use HAVE_SPATIALINDEX
Modified:
trunk/apps/lascommon.c
trunk/apps/lasindex.cpp
trunk/apps/lasinfo.c
trunk/include/liblas/lasreader.hpp
trunk/src/lasreader.cpp
Modified: trunk/apps/lascommon.c
==============================================================================
--- trunk/apps/lascommon.c (original)
+++ trunk/apps/lascommon.c Mon May 4 13:16:55 2009
@@ -1,6 +1,6 @@
/* liblas */
#include <liblas.h>
-#ifdef HAVE_GEOTIFF
+#ifdef HAVE_LIBGEOTIFF
#include <geotiff.h>
#include <geo_normalize.h>
#endif
@@ -405,12 +405,12 @@
uint32_t nVLR = 0;
int i = 0;
-#ifdef HAVE_GEOTIFF
+#ifdef HAVE_LIBGEOTIFF
const GTIF* pGTIF = NULL;
- GTIFDefn defn;
+// GTIFDefn defn;
#else
const void* pGTIF = NULL;
- const void* defn =NULL;
+// const void* defn =NULL;
#endif
pszSignature = LASHeader_GetFileSignature(header);
Modified: trunk/apps/lasindex.cpp
==============================================================================
--- trunk/apps/lasindex.cpp (original)
+++ trunk/apps/lasindex.cpp Mon May 4 13:16:55 2009
@@ -6,6 +6,7 @@
#include <liblas/lascolor.hpp>
#include <liblas/lasreader.hpp>
#include <liblas/lasheader.hpp>
+#include <liblas/lasindex.hpp>
#include <iostream>
#include <fstream>
Modified: trunk/apps/lasinfo.c
==============================================================================
--- trunk/apps/lasinfo.c (original)
+++ trunk/apps/lasinfo.c Mon May 4 13:16:55 2009
@@ -191,7 +191,7 @@
{
wkt = TRUE;
}
- else if (i == argc - 1 && file_name == NULL)
+ else if (file_name == NULL)
{
file_name = argv[i];
}
Modified: trunk/include/liblas/lasreader.hpp
==============================================================================
--- trunk/include/liblas/lasreader.hpp (original)
+++ trunk/include/liblas/lasreader.hpp Mon May 4 13:16:55 2009
@@ -49,7 +49,7 @@
#include <liblas/lasspatialreference.hpp>
#include <liblas/detail/fwd.hpp>
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
#include <liblas/lasindex.hpp>
#endif
@@ -92,7 +92,7 @@
void Index(std::string& filename);
void Index();
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
LASIndex* GetIndex();
#endif
@@ -111,7 +111,7 @@
bool m_doindex;
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
LASIndex* m_index;
#else
typedef void* LASIndex;
Modified: trunk/src/lasreader.cpp
==============================================================================
--- trunk/src/lasreader.cpp (original)
+++ trunk/src/lasreader.cpp Mon May 4 13:16:55 2009
@@ -58,7 +58,7 @@
m_pimpl(detail::ReaderFactory::Create(ifs)),
m_doindex(false)
{
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
m_index = 0;
#endif
Init();
@@ -68,7 +68,7 @@
{
// empty, but required so we can implement PIMPL using
// std::auto_ptr with incomplete type (Reader).
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
if (m_index != 0) delete m_index;
#endif
}
@@ -98,7 +98,7 @@
{
bool ret = m_pimpl->ReadPointAt(n, m_point, m_header);
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
if (m_doindex) m_index->insert(m_point, n);
#endif
return ret;
@@ -159,7 +159,7 @@
void LASReader::Index()
{
m_doindex = true;
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
m_index = new LASIndex();
#endif
}
@@ -167,12 +167,12 @@
void LASReader::Index(std::string& filename)
{
m_doindex = true;
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
m_index = new LASIndex(filename);
#endif
}
-#ifdef USE_SPATIALINDEX
+#ifdef HAVE_SPATIALINDEX
LASIndex* LASReader::GetIndex()
{
More information about the Liblas-commits
mailing list