Changeset 1307:47aa99c03689

Timestamp:

09/30/09 09:05:27 (10 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

clean up liblas.point.Point creation, ensure that copy semantics are right, and add as LASPoint_Destroy prototype, which not was causing a big problem on snow leopard.

Files:

• .hgignore (modified) (1 diff)
• python/liblas/core.py (modified) (1 diff)
• python/liblas/file.py (modified) (2 diffs)
• python/liblas/point.py (modified) (1 diff)

.hgignore

@@ -37 +37 @@
 python/dist/*
 python/libLAS.egg-info/*
+python/liblas/*.pyc

python/liblas/core.py

@@ -587 +587 @@
 las.LASPoint_SetColor.errcheck = check_return
 
+las.LASPoint_Destroy.argtypes = [ctypes.c_void_p]
+las.LASPoint_Destroy.errcheck = check_void_done
+las.LASPoint_Destroy.restype = None
+
 las.LASSRS_Create.errcheck = check_void
 las.LASSRS_Create.restype = ctypes.c_void_p

python/liblas/file.py

@@ -132 +132 @@
     def read(self, location):
         if self.mode == 0:
-            return point.Point(handle=core.las.LASReader_GetPointAt(self.handle, location), owned= False, copy=True)
+            return point.Point(handle=core.las.LASReader_GetPointAt(self.handle, location), copy=True)
 
     def __iter__(self):
@@ -139 +139 @@
             p = core.las.LASReader_GetNextPoint(self.handle)
             while p and not self.at_end:
-                yield point.Point(handle=p, owned= False, copy=True)
+                yield point.Point(handle=p, copy=True)
                 p = core.las.LASReader_GetNextPoint(self.handle)
                 if not p:

python/liblas/point.py

@@ -52 +52 @@
             if copy:
                 self.handle = core.las.LASPoint_Copy(handle)
+                self._owned = True
             else:
                 self.handle = handle
+                self._owned = False
         else:
             self.handle = core.las.LASPoint_Create()
-        if not copy:
-            self.owned = owned
-        else:
-            self.owned = True
+            self._owned = True
     def __del__(self):
-        if self.owned:
+        if self._owned:
             if self.handle and core:
                 core.las.LASPoint_Destroy(self.handle)