[Liblas-commits] hg: update to reflect we now use base GDAL 1.8 for
OSGeo4W inste...
liblas-commits at liblas.org
liblas-commits at liblas.org
Tue Feb 1 13:04:59 EST 2011
details: http://hg.liblas.orghg/rev/f934593496b3
changeset: 2840:f934593496b3
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Feb 01 11:08:03 2011 -0600
description:
update to reflect we now use base GDAL 1.8 for OSGeo4W instead of the gdal-dev build
Subject: hg: update to reflect we now use base GDAL 1.8 for OSGeo4W instead of the gdal-dev build
details: http://hg.liblas.orghg/rev/ad018915b8ba
changeset: 2841:ad018915b8ba
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Feb 01 11:08:08 2011 -0600
description:
update to reflect we now use base GDAL 1.8 for OSGeo4W instead of the gdal-dev build
Subject: hg: reflect using OSGeo4W's LASzip
details: http://hg.liblas.orghg/rev/09b4e8d101d2
changeset: 2842:09b4e8d101d2
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Feb 01 12:04:44 2011 -0600
description:
reflect using OSGeo4W's LASzip
Subject: hg: merge
details: http://hg.liblas.orghg/rev/81b81380a6ba
changeset: 2843:81b81380a6ba
user: Howard Butler <hobu.inc at gmail.com>
date: Tue Feb 01 12:04:52 2011 -0600
description:
merge
diffstat:
CMakeLists.txt | 4 +-
doc/download.txt | 4 +-
doc/zip/index.txt | 54 ---------------------------------------
hobu-config.bat | 12 ++++----
include/liblas/capi/las_version.h | 6 ++--
liblas-osgeo4w-init.bat | 2 +-
liblas-osgeo4w-start.bat.tmpl | 6 ++--
python/setup.py | 2 +-
src/header.cpp | 2 +-
9 files changed, 19 insertions(+), 73 deletions(-)
diffs (201 lines):
diff -r 3f0cf2bdd9ea -r 81b81380a6ba CMakeLists.txt
--- a/CMakeLists.txt Tue Feb 01 08:44:41 2011 -0800
+++ b/CMakeLists.txt Tue Feb 01 12:04:52 2011 -0600
@@ -11,11 +11,11 @@
SET(LIBLAS_VERSION_MAJOR "1")
SET(LIBLAS_VERSION_MINOR "6")
-SET(LIBLAS_VERSION_PATCH "0b4")
+SET(LIBLAS_VERSION_PATCH "0")
set(VERSION "${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_PATCH}")
SET(LIBLAS_LIB_SOVERSION "2.0.0")
SET(LIBLAS_C_LIB_SOVERSION "2.0.0")
-SET(OSGEO4W_UPSTREAM_RELEASE "2")
+SET(OSGEO4W_UPSTREAM_RELEASE "1")
if(WIN32)
# Name of C++ library
diff -r 3f0cf2bdd9ea -r 81b81380a6ba doc/download.txt
--- a/doc/download.txt Tue Feb 01 08:44:41 2011 -0800
+++ b/doc/download.txt Tue Feb 01 12:04:52 2011 -0600
@@ -22,7 +22,7 @@
.. note::
- You may also want :ref:`laszip` for compression support.
+ You may also want `LASzip`_ for compression support.
.. seealso::
:ref:`source`
@@ -173,4 +173,4 @@
.. _`DebianGIS`: http://wiki.debian.org/DebianGis
-
+.. _`LASzip`: http://laszip.org
diff -r 3f0cf2bdd9ea -r 81b81380a6ba doc/zip/index.txt
--- a/doc/zip/index.txt Tue Feb 01 08:44:41 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-.. _laszip:
-
-******************************************************************************
-LASzip
-******************************************************************************
-
-
-Current Release(s)
-------------------------------------------------------------------------------
-
-* **2011-01-17**
-
- - `laszip-1.0.0-src.tar.gz <http://download.osgeo.org/laszip/laszip-1.0.0.tar.gz>`_
- `(md5) <http://download.osgeo.org/laszip/laszip-1.0.0.tar.gz.md5>`__
-
- - `laszip-1.0.0-src.zip <http://download.osgeo.org/laszip/laszip-1.0.0.zip>`_
- `(md5) <http://download.osgeo.org/liblas/laszip-1.0.0.zip.md5>`__
-
- - See `OSGeo4W <http://trac.osgeo.org/osgeo4w>`__ for Windows release.
-
-
-Development Source
-..............................................................................
-
-* Current Trunk: http://hg.liblas.org/zip
-
-
-Background
-------------------------------------------------------------------------------
-
-LASzip is a compression library that was developed by `Martin Isenburg`_ for
-compressing `ASPRS LAS format`_ data in his :ref:`LAStools <lastools_liblas>`.
-It has been provided as an `LGPL`_-licensed stand-alone software library to allow
-other softwares that handle LAS data to read and write LASzip-compressed data.
-libLAS can optionally take advantage of LASzip as of libLAS 1.6.0b4 to read
-and write compressed data. Currently, both LAStools and libLAS can
-interchange data using LASzip compression
-
-The compression can be many times smaller and many times
-faster than `bz2`_, `gzip`_, and `rar` due to the fact that it can take advantage
-of known and regular data patterns that exist in LAS data. LASzip uses
-two widely known and open compression techniques that have been adapted to
-LAS data to accomplish its task. The first is a
-
-
-
-
-
-
-
-.. _`Martin Isenburg`: http://www.cs.unc.edu/~isenburg/lastools/
-.. _`ASPRS LAS format`: http://www.asprs.org/society/committees/standards/lidar_exchange_format.html
-.. _`LGPL`: http://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License
-.. _`bz2`: http://en.wikipedia.org/wiki/Bzip2
-.. _`gz`: http://en.wikipedia.org/wiki/Gzip
-.. _`rar`: http://en.wikipedia.org/wiki/Rar
\ No newline at end of file
diff -r 3f0cf2bdd9ea -r 81b81380a6ba hobu-config.bat
--- a/hobu-config.bat Tue Feb 01 08:44:41 2011 -0800
+++ b/hobu-config.bat Tue Feb 01 12:04:52 2011 -0600
@@ -8,11 +8,11 @@
set BOOST=D:\boost\boost_1_44
set ORACLE_HOME=%OSGEO4W%
set LASZIP_ROOT=d:\laszip
-REM set BUILD_TYPE=RelWithDebInfo
-set BUILD_TYPE=Debug
+set BUILD_TYPE=RelWithDebInfo
+REM set BUILD_TYPE=Debug
REM set BUILD_TYPE=Release
-set PATH=%OSGEO4W%\apps\gdal-dev\bin;%OSGEO4W%\bin;%PATH%
+set PATH=%OSGEO4W%\bin;%PATH%
cmake -G %G% ^
@@ -20,13 +20,13 @@
-DWITH_GDAL=ON ^
-DWITH_GEOTIFF=ON ^
-DWITH_ORACLE=ON ^
- -DWITH_LASZIP=OFF ^
+ -DWITH_LASZIP=ON ^
-DTIFF_INCLUDE_DIR=%OSGEO4W%\include ^
-DTIFF_LIBRARY=%OSGEO4W%\lib\libtiff_i.lib ^
-DGEOTIFF_INCLUDE_DIR=%OSGEO4W%\include ^
-DGEOTIFF_LIBRARY=%OSGEO4W%\lib\geotiff_i.lib ^
- -DGDAL_INCLUDE_DIR=%OSGEO4W%\apps\gdal-dev\include ^
- -DGDAL_LIBRARY=%OSGEO4W%\apps\gdal-dev\lib\gdal_i.lib ^
+ -DGDAL_INCLUDE_DIR=%OSGEO4W%\include ^
+ -DGDAL_LIBRARY=%OSGEO4W%\lib\gdal_i.lib ^
-DORACLE_INCLUDE_DIR=%ORACLE_HOME%\include ^
-DORACLE_OCI_LIBRARY=%ORACLE_HOME%\lib\oci.lib ^
-DLASZIP_INCLUDE_DIR=%OSGEO4W%\include ^
diff -r 3f0cf2bdd9ea -r 81b81380a6ba include/liblas/capi/las_version.h
--- a/include/liblas/capi/las_version.h Tue Feb 01 08:44:41 2011 -0800
+++ b/include/liblas/capi/las_version.h Tue Feb 01 12:04:52 2011 -0600
@@ -45,7 +45,7 @@
#ifndef LIBLAS_VERSION_MAJOR
#define LIBLAS_VERSION_MAJOR 1
#define LIBLAS_VERSION_MINOR 6
-#define LIBLAS_VERSION_REV 0b4
+#define LIBLAS_VERSION_REV 0
#define LIBLAS_VERSION_BUILD 0
#endif
@@ -54,11 +54,11 @@
#endif
#ifndef LIBLAS_RELEASE_DATE
-#define LIBLAS_RELEASE_DATE 20100107
+#define LIBLAS_RELEASE_DATE 20100201
#endif
#ifndef LIBLAS_RELEASE_NAME
-#define LIBLAS_RELEASE_NAME "1.6.0b4"
+#define LIBLAS_RELEASE_NAME "1.6.0"
#endif
#endif /* LAS_VERSION_H_INCLUDED */
diff -r 3f0cf2bdd9ea -r 81b81380a6ba liblas-osgeo4w-init.bat
--- a/liblas-osgeo4w-init.bat Tue Feb 01 08:44:41 2011 -0800
+++ b/liblas-osgeo4w-init.bat Tue Feb 01 12:04:52 2011 -0600
@@ -1,1 +1,1 @@
-SET GDAL_DATA=%OSGEO4W_ROOT%\apps\gdal-dev\share\gdal
+SET GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
diff -r 3f0cf2bdd9ea -r 81b81380a6ba liblas-osgeo4w-start.bat.tmpl
--- a/liblas-osgeo4w-start.bat.tmpl Tue Feb 01 08:44:41 2011 -0800
+++ b/liblas-osgeo4w-start.bat.tmpl Tue Feb 01 12:04:52 2011 -0600
@@ -1,7 +1,7 @@
@echo off
SET OSGEO4W_ROOT=@osgeo4w@
-SET GDAL_DATA=%OSGEO4W_ROOT%\apps\gdal-dev\share\gdal
-SET PYTHONPATH=%OSGEO4W_ROOT%\apps\gdal-dev\pymod;%PYTHONPATH%
-PATH=%OSGEO4W_ROOT%\apps\gdal-dev\bin;%OSGEO4W_ROOT%\bin;%PATH%
+SET GDAL_DATA=%OSGEO4W_ROOT%\share\gdal
+SET PROJ_LIB=%OSGEO4W_ROOT%\share\proj
+SET PYTHONPATH=%OSGEO4W_ROOT%\pymod;%PYTHONPATH%
start "libLAS OSGeo4W Shell"
@echo on
diff -r 3f0cf2bdd9ea -r 81b81380a6ba python/setup.py
--- a/python/setup.py Tue Feb 01 08:44:41 2011 -0800
+++ b/python/setup.py Tue Feb 01 12:04:52 2011 -0600
@@ -18,7 +18,7 @@
import os
-version = '1.6.0b4'
+version = '1.6.0'
scripts =['scripts/oci2las.py']
diff -r 3f0cf2bdd9ea -r 81b81380a6ba src/header.cpp
--- a/src/header.cpp Tue Feb 01 08:44:41 2011 -0800
+++ b/src/header.cpp Tue Feb 01 12:04:52 2011 -0600
@@ -65,7 +65,7 @@
char const* const Header::FileSignature = "LASF";
char const* const Header::SystemIdentifier = "libLAS";
-char const* const Header::SoftwareIdentifier = "libLAS 1.6.0b4";
+char const* const Header::SoftwareIdentifier = "libLAS 1.6.0";
Header::Header() : m_schema(ePointFormat3)
More information about the Liblas-commits
mailing list