This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch upstream-master in repository pktools.
commit 7de3a2b42c92056bbf3f8a9e3ea2fb5ebf361bde Author: Pieter Kempeneers <kempe...@gmail.com> Date: Sun Aug 10 23:54:58 2014 +0200 bug fix #42951 (liblas 1.8 support) --- ChangeLog | 4 ++++ configure.ac | 2 +- pktools.pc | 2 +- src/apps/pkfilterdem.cc | 3 ++- src/apps/pklas2img.cc | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92902ef..e0a265c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -298,6 +298,10 @@ version 2.5.2 redesign to optimize vector polygon processing removed option for masking, introduced srcnodata and bndnodata (more testing is needed) +version 2.5.3 + - pklas2img + libLAS 1.8.0 support (ticket #42951) + Next versions: - todo for API: ImgReaderGdal (ImgWriterGdal) open in update mode (check gdal_edit.py: http://searchcode.com/codesearch/view/18938404) diff --git a/configure.ac b/configure.ac index d25f8ec..99895c2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([pktools], [2.5.2], [kempe...@gmail.com]) +AC_INIT([pktools], [2.5.3], [kempe...@gmail.com]) #AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Wno-extra-portability foreign]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/pktools.pc b/pktools.pc index fd864e0..8a16cc4 100644 --- a/pktools.pc +++ b/pktools.pc @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: pktools Description: API library for pktools Requires: gdal gsl -Version: 2.5.2 +Version: 2.5.3 Libs: -L${libdir} -lbase -lalgorithms -limageClasses -lfileClasses -llasClasses Cflags: -I${includedir}/pktools diff --git a/src/apps/pkfilterdem.cc b/src/apps/pkfilterdem.cc index 62f5d0b..a62c598 100644 --- a/src/apps/pkfilterdem.cc +++ b/src/apps/pkfilterdem.cc @@ -332,8 +332,9 @@ int main(int argc,char **argv) { hThreshold=hThreshold_opt[0]+maxSlope_opt[0]*(newdim-dim)*input.getDeltaX(); dim=newdim; if(hThreshold_opt.size()>1){ - if(hThreshold>hThreshold_opt[1]) + if(hThreshold>hThreshold_opt[1]){ hThreshold=hThreshold_opt[1]; + } } std::cout << "iteration " << iteration << ": " << nchange << " pixels changed" << std::endl; ++iteration; diff --git a/src/apps/pklas2img.cc b/src/apps/pklas2img.cc index 1f50a53..5cf97f8 100644 --- a/src/apps/pklas2img.cc +++ b/src/apps/pklas2img.cc @@ -283,7 +283,7 @@ int main(int argc,char **argv) { attribute_opt.erase(ait); } } - liblas::Point thePoint; + liblas::Point thePoint(&(lasReader.getHeader())); while(lasReader.readNextPoint(thePoint)){ progress=static_cast<float>(ipoint)/totalPoints; pfnProgress(progress,pszMessage,pProgressArg); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel