Changeset 1607:205ed6652931

Timestamp:

03/02/10 15:10:14 (5 months ago)

Author:

Mateusz Loskot <mateusz@…>

Branch:

default

Message:

Added LAS_GetFullVersion function to C API (Ticket #170)

Files:

• apps/lasinfo.c (modified) (1 diff)
• include/liblas/capi/liblas.h (modified) (1 diff)
• src/las_c_api.cpp (modified) (2 diffs)

apps/lasinfo.c

@@ -103 +103 @@
     for (i = 1; i < argc; i++)
     {
-        if (strcmp(argv[i],"-h") == 0 || strcmp(argv[i],"--help") == 0)
+        if (strcmp(argv[i],"-v") == 0 || strcmp(argv[i],"--version") == 0)
+        {
+            char* ver = LAS_GetFullVersion();
+            fprintf(stderr,"%s", ver);
+            free(ver);
+            exit(0);
+        }
+        else if (strcmp(argv[i],"-h") == 0 || strcmp(argv[i],"--help") == 0)
         {
             usage();

include/liblas/capi/liblas.h

@@ -128 +128 @@
 */
 LAS_DLL char* LAS_GetVersion(void);
+LAS_DLL char* LAS_GetFullVersion(void);
 
 LAS_DLL int LAS_IsLibGeoTIFFEnabled(void);

src/las_c_api.cpp

@@ -84 +84 @@
 #endif
 
+
+#ifdef HAVE_SPATIALINDEX
+#include <spatialindex/Version.h>
+#endif
+
 #ifdef _WIN32
 #define compare_no_case(a,b,n)  _strnicmp( (a), (b), (n) )
@@ -1526 +1531 @@
 }
 
-LAS_DLL char * LAS_GetVersion() {
-
-    /* XXX - mloskot: I'd suggest to define PACKAGE_VERSION as static object
-       and return safe const pointer, instead of newly allocated string. */
-
-    /* FIXME - mloskot: Termporarily, I defined PACKAGE_VERSION
-       in las_config.h to solve Visual C++ compilation  (Ticket #23) */
-
-    std::ostringstream output;
-        
+LAS_DLL char* LAS_GetVersion() {
+
 //    output << LIBLAS_VERSION_MAJOR;
 //    output << "." << LIBLAS_VERSION_MINOR;
 //    output << "." << LIBLAS_VERSION_REV;
 //    output << "." << LIBLAS_VERSION_BUILD;
-    output << LIBLAS_RELEASE_NAME;
-    std::string out(output.str());
-    return strdup(out.c_str());
-}
-
+    char const* version = LIBLAS_RELEASE_NAME;
+    return strdup(version);
+}
+
+LAS_DLL char* LAS_GetFullVersion(void) {
+
+    std::ostringstream os;
+#ifdef HAVE_LIBGEOTIFF
+    os << " GeoTIFF "
+       << (LIBGEOTIFF_VERSION / 1000) << '.'
+       << (LIBGEOTIFF_VERSION / 100 % 10) << '.'
+       << (LIBGEOTIFF_VERSION % 100 / 10);
+#endif
+#ifdef HAVE_GDAL
+    os << " GDAL " << GDALVersionInfo("RELEASE_NAME");
+#endif
+#ifdef HAVE_SPATIALINDEX
+    os << " SpatialIndex "
+       << SIDX_VERSION_MAJOR << '.'
+       << SIDX_VERSION_MINOR << '.'
+       << SIDX_VERSION_REV;
+#endif
+
+    std::string info(os.str());
+    os.str("");
+    os << "libLAS " << LIBLAS_RELEASE_NAME;
+    if (!info.empty())
+    {
+        os << " with" << info;
+    }
+    os << std::endl;
+
+    return strdup(os.str().c_str());
+}