Changeset 1322:e0723b684248

Timestamp:

10/02/09 09:28:12 (10 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

1.2

Message:

return types for those functions returning char *'s. It's unclear who's freeing them. ctypes seems to choke when I manually free them, so I wonder if it is doing it as it makes the returned string

File:

• python/liblas/core.py (modified) (11 diffs)

python/liblas/core.py

@@ -94 +94 @@
         raise LASException(msg)
     retval = ctypes.string_at(result)[:]
-    free(result)
+
+    # these might end up being double frees, I don't know why
+    # free(result)
     return retval
 
@@ -101 +103 @@
     size = ctypes.c_int()
     retvalue = ctypes.string_at(result)
-    free(result)
+    
+    # these might end up being double frees, I don't know why
+    # free(result)
     return retvalue
-    
-    
-
-try:
-    from numpy import array, ndarray
-    HAS_NUMPY = True
-except ImportError:
-    HAS_NUMPY = False
 
 if os.name == 'nt':
@@ -303 +299 @@
 las.LASHeader_GetFileSignature.argtypes = [ctypes.c_void_p]
 las.LASHeader_GetFileSignature.errcheck = check_value_free
+las.LASHeader_GetFileSignature.restype = ctypes.c_char_p
 
 las.LASHeader_GetFileSourceId.restype = ctypes.c_ushort
@@ -310 +307 @@
 las.LASHeader_GetProjectId.argtypes = [ctypes.c_void_p]
 las.LASHeader_GetProjectId.errcheck = check_value_free
+las.LASHeader_GetProjectId.restype = ctypes.c_char_p
 
 las.LASHeader_GetVersionMajor.restype = ctypes.c_ubyte
@@ -327 +325 @@
 las.LASHeader_GetSystemId.argtypes = [ctypes.c_void_p]
 las.LASHeader_GetSystemId.errcheck = check_value_free
+las.LASHeader_GetSystemId.restype = ctypes.c_char_p
 las.LASHeader_SetSystemId.restype = ctypes.c_int
 las.LASHeader_SetSystemId.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
@@ -333 +332 @@
 las.LASHeader_GetSoftwareId.argtypes = [ctypes.c_void_p]
 las.LASHeader_GetSoftwareId.errcheck = check_value_free
+las.LASHeader_GetSoftwareId.restype = ctypes.c_char_p
 las.LASHeader_SetSoftwareId.restype = ctypes.c_int
 las.LASHeader_SetSoftwareId.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
@@ -484 +484 @@
 las.LASGuid_AsString.argtypes = [ctypes.c_void_p]
 las.LASGuid_AsString.errcheck = check_value_free
+las.LASGuid_AsString.restype = ctypes.c_char_p
 
 las.LASGuid_Equals.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
@@ -512 +513 @@
 las.LASVLR_GetUserId.argtypes = [ctypes.c_void_p]
 las.LASVLR_GetUserId.errcheck = check_value_free
+las.LASVLR_GetUserId.restype = ctypes.c_char_p
 las.LASVLR_SetUserId.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
 las.LASVLR_SetUserId.errcheck = check_return
@@ -518 +520 @@
 las.LASVLR_GetDescription.argtypes = [ctypes.c_void_p]
 las.LASVLR_GetDescription.errcheck = check_value_free
+las.LASVLR_GetDescription.restype = ctypes.c_char_p
 las.LASVLR_SetDescription.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
 las.LASVLR_SetDescription.errcheck = check_return
@@ -596 +599 @@
 las.LASSRS_GetProj4.argtypes = [ctypes.c_void_p]
 las.LASSRS_GetProj4.errcheck = check_value_free
+las.LASSRS_GetProj4.restype = ctypes.c_char_p
 las.LASSRS_SetProj4.restype = ctypes.c_int
 las.LASSRS_SetProj4.argtypes = [ctypes.c_void_p, ctypes.c_char_p]
@@ -602 +606 @@
 las.LASSRS_GetWKT.argtypes = [ctypes.c_void_p]
 las.LASSRS_GetWKT.errcheck = check_value_free
+las.LASSRS_GetWKT.restype = ctypes.c_char_p
 las.LASSRS_SetWKT.restype = ctypes.c_int
 las.LASSRS_SetWKT.argtypes = [ctypes.c_void_p, ctypes.c_char_p]