Changeset 980:2f216f49da09

Timestamp:

02/20/09 13:49:27 (18 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Convert:

svn:1766ff46-f334-0410-ab20-d63176f87757/trunk@1058

Message:

add the ability to check for HAVE_GDAL and HAVE_LIBGEOTIFF at runtime

Files:

• include/liblas/capi/liblas.h (modified) (1 diff)
• include/liblas/liblas.hpp (modified) (1 diff)
• python/liblas/__init__.py (modified) (1 diff)
• python/liblas/core.py (modified) (1 diff)
• python/tests/VLR.txt (modified) (2 diffs)
• src/las_c_api.cpp (modified) (2 diffs)

include/liblas/capi/liblas.h

@@ -125 +125 @@
  *  @return the version string for this library.
 */
-LAS_DLL char* LAS_GetVersion();
+LAS_DLL char* LAS_GetVersion(void);
+
+LAS_DLL int LAS_IsLibGeoTIFFEnabled(void);
+
+LAS_DLL int LAS_IsGDALEnabled(void);
 
 /****************************************************************************/

include/liblas/liblas.hpp

@@ -99 +99 @@
 }
 
+inline bool IsGDALEnabled()
+{
+#ifdef HAVE_GDAL
+    return true;
+#else
+    return false;
+#endif
+}
+
+inline bool IsLibGeoTIFFEnabled()
+{
+#ifdef HAVE_LIBGEOTIFF
+    return true;
+#else
+    return false;
+#endif
+}
+
 } // namespace liblas
 

python/liblas/__init__.py

@@ -1 +1 @@
 from core import *
 version = get_version()
+HAVE_GDAL = bool(las.LAS_IsGDALEnabled())
+HAVE_LIBGEOTIFF = bool(las.LAS_IsLibGeoTIFFEnabled())
+
 import file
 import point

python/liblas/core.py

@@ -148 +148 @@
 version = get_version()
 
+las.LAS_IsGDALEnabled.restype = ctypes.c_int
+las.LAS_IsLibGeoTIFFEnabled.restype = ctypes.c_int
+
 las.LAS_GetVersion.restype = ctypes.POINTER(ctypes.c_char)
 las.LAS_GetVersion.errcheck = free_returned_char_p

python/tests/VLR.txt

@@ -54 +54 @@
   [2, 32, 4, 5, 6, 7, 8, 9, 10, 11]
   
-    
+  >>> import liblas
+
+#  >>> liblas.HAVE_GDAL
+#  >>> liblas.HAVE_LIBGEOTIFF
+
   >>> from liblas import file
   >>> f = file.File('../test/data/srs.las')
@@ -60 +64 @@
   >>> h.records_count
   3L
-  >>> h.proj4
-  '+proj=utm +zone=17 +ellps=WGS84 +datum=WGS84 +units=m +no_defs '
+  >>> if not liblas.HAVE_GDAL:
+  ...     h.proj4
+  '+proj=utm +zone=17 +ellps=WGS84 +units=m '
+
   >>> v = h.GetVLR(0)
   >>> v.recordid

src/las_c_api.cpp

@@ -42 +42 @@
  ****************************************************************************/
 
-
+#include <liblas/liblas.hpp>
 #include <liblas/lasreader.hpp>
 #include <liblas/laserror.hpp>
@@ -126 +126 @@
         return (rc); \
    }} while(0)
+
+LAS_DLL int LAS_IsGDALEnabled(void) {
+    return IsGDALEnabled();
+}
+
+LAS_DLL int LAS_IsLibGeoTIFFEnabled(void) {
+    return IsLibGeoTIFFEnabled();
+}
 
 LAS_DLL void LASError_Reset(void) {