[Liblas-commits] hg-main-tree: force the deletion order of LASzip objects before ...

[liblas-commits at liblas.org]

details:   http://hg.libpc.orghg-main-tree/rev/898005ec4dd4
changeset: 776:898005ec4dd4
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Jun 09 11:50:31 2011 -0500
description:
force the deletion order of LASzip objects before we close the stream
Subject: hg-main-tree: rename old libpc file.  libPC is now dead.  Long live PDAL

details:   http://hg.libpc.orghg-main-tree/rev/ff4f5f0158f2
changeset: 777:ff4f5f0158f2
user:      Howard Butler <hobu.inc at gmail.com>
date:      Thu Jun 09 11:54:34 2011 -0500
description:
rename old libpc file.  libPC is now dead.  Long live PDAL

diffstat:

 include/pdal/drivers/las/Iterator.hpp |   2 +-
 libpc_defines.h.in                    |  70 -----------------------------------
 pdal_defines.h.in                     |  70 +++++++++++++++++++++++++++++++++++
 src/drivers/las/Iterator.cpp          |   3 +
 4 files changed, 74 insertions(+), 71 deletions(-)

diffs (174 lines):

diff -r 5c533adc4b0c -r ff4f5f0158f2 include/pdal/drivers/las/Iterator.hpp
--- a/include/pdal/drivers/las/Iterator.hpp	Thu Jun 09 11:21:09 2011 -0500
+++ b/include/pdal/drivers/las/Iterator.hpp	Thu Jun 09 11:54:34 2011 -0500
@@ -66,8 +66,8 @@
 public:
 #ifdef PDAL_HAVE_LASZIP
     boost::scoped_ptr<LASzip> m_zip;
+    boost::scoped_ptr<ZipPoint> m_zipPoint;
     boost::scoped_ptr<LASunzipper> m_unzipper;
-    boost::scoped_ptr<ZipPoint> m_zipPoint;
 
 #endif
 
diff -r 5c533adc4b0c -r ff4f5f0158f2 libpc_defines.h.in
--- a/libpc_defines.h.in	Thu Jun 09 11:21:09 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/* 
- * pdal_defines.h.in is used by cmake to generate pdal_defines.h
- *
- * Do not edit pdal_defines.h!
- *
- * Note this is a C-style header.  Do not use C++ syntax.
- */
-#ifndef LIBPC_DEFINES_H
-#define LIBPC_DEFINES_H
-
-/*
- * version settings
- */
-#define LIBPC_VERSION_MAJOR @LIBPC_VERSION_MAJOR@
-#define LIBPC_VERSION_MINOR @LIBPC_VERSION_MINOR@
-#define LIBPC_VERSION_PATCH @LIBPC_VERSION_PATCH@
-
-#define LIBPC_VERSION_STRING "@LIBPC_VERSION_STRING@"
-
-/* (note this will look yucky until we get to major>=1) */
-#define LIBPC_VERSION_INTEGER ((LIBPC_VERSION_MAJOR*100*100)+(LIBPC_VERSION_MINOR*100)+LIBPC_VERSION_PATCH)
-
-
-/*
- * availability of 3rd-party libraries
- */
-#cmakedefine LIBPC_HAVE_LIBLAS
-#cmakedefine LIBPC_HAVE_LASZIP
-#cmakedefine LIBPC_HAVE_ORACLE
-#cmakedefine LIBPC_HAVE_GDAL
-#cmakedefine LIBPC_HAVE_LIBXML2
-#cmakedefine LIBPC_HAVE_LIBGEOTIFF
-#cmakedefine LIBPC_HAVE_MRSID
-
-
-/*
- * platform endianness
- */
-#cmakedefine LIBPC_ENDIAN_AWARE
-
-/*
- * Debug or Release build?
- */
-#define LIBPC_BUILD_TYPE "@LIBPC_BUILD_TYPE@"
-
-/*
- * platform OS
- */
-#cmakedefine LIBPC_PLATFORM_WIN32
-
-/*
- * platform compiler 
- */
-#cmakedefine LIBPC_COMPILER_MSVC
-#cmakedefine LIBPC_COMPILER_VC10
-#cmakedefine LIBPC_COMPILER_VC9
-#cmakedefine LIBPC_COMPILER_VC8
-#cmakedefine LIBPC_COMPILER_GCC
-#cmakedefine LIBPC_COMPILER_CLANG
-
-
-/*
- * We have two modes: with GDAL and geotiff, SRS is enabled -- otherwise, it's disabled
- * we use one macro to simplify the control
- */
-#if defined(LIBPC_HAVE_GDAL) && defined(LIBPC_HAVE_LIBGEOTIFF)
-#define LIBPC_SRS_ENABLED
-#endif
-
-#endif
diff -r 5c533adc4b0c -r ff4f5f0158f2 pdal_defines.h.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pdal_defines.h.in	Thu Jun 09 11:54:34 2011 -0500
@@ -0,0 +1,70 @@
+/* 
+ * pdal_defines.h.in is used by cmake to generate pdal_defines.h
+ *
+ * Do not edit pdal_defines.h!
+ *
+ * Note this is a C-style header.  Do not use C++ syntax.
+ */
+#ifndef PDAL_DEFINES_H
+#define PDAL_DEFINES_H
+
+/*
+ * version settings
+ */
+#define PDAL_VERSION_MAJOR @PDAL_VERSION_MAJOR@
+#define PDAL_VERSION_MINOR @PDAL_VERSION_MINOR@
+#define PDAL_VERSION_PATCH @PDAL_VERSION_PATCH@
+
+#define PDAL_VERSION_STRING "@PDAL_VERSION_STRING@"
+
+/* (note this will look yucky until we get to major>=1) */
+#define PDAL_VERSION_INTEGER ((PDAL_VERSION_MAJOR*100*100)+(PDAL_VERSION_MINOR*100)+PDAL_VERSION_PATCH)
+
+
+/*
+ * availability of 3rd-party libraries
+ */
+#cmakedefine PDAL_HAVE_LIBLAS
+#cmakedefine PDAL_HAVE_LASZIP
+#cmakedefine PDAL_HAVE_ORACLE
+#cmakedefine PDAL_HAVE_GDAL
+#cmakedefine PDAL_HAVE_LIBXML2
+#cmakedefine PDAL_HAVE_LIBGEOTIFF
+#cmakedefine PDAL_HAVE_MRSID
+
+
+/*
+ * platform endianness
+ */
+#cmakedefine PDAL_ENDIAN_AWARE
+
+/*
+ * Debug or Release build?
+ */
+#define PDAL_BUILD_TYPE "@PDAL_BUILD_TYPE@"
+
+/*
+ * platform OS
+ */
+#cmakedefine PDAL_PLATFORM_WIN32
+
+/*
+ * platform compiler 
+ */
+#cmakedefine PDAL_COMPILER_MSVC
+#cmakedefine PDAL_COMPILER_VC10
+#cmakedefine PDAL_COMPILER_VC9
+#cmakedefine PDAL_COMPILER_VC8
+#cmakedefine PDAL_COMPILER_GCC
+#cmakedefine PDAL_COMPILER_CLANG
+
+
+/*
+ * We have two modes: with GDAL and geotiff, SRS is enabled -- otherwise, it's disabled
+ * we use one macro to simplify the control
+ */
+#if defined(PDAL_HAVE_GDAL) && defined(PDAL_HAVE_LIBGEOTIFF)
+#define PDAL_SRS_ENABLED
+#endif
+
+#endif
diff -r 5c533adc4b0c -r ff4f5f0158f2 src/drivers/las/Iterator.cpp
--- a/src/drivers/las/Iterator.cpp	Thu Jun 09 11:21:09 2011 -0500
+++ b/src/drivers/las/Iterator.cpp	Thu Jun 09 11:54:34 2011 -0500
@@ -69,6 +69,9 @@
 
 IteratorBase::~IteratorBase()
 {
+    m_zipPoint.reset();
+    m_zip.reset();
+    m_unzipper.reset();
     Utils::closeFile(m_istream);
 }