[pktools] 02/03: Add support for libLAS 1.8.0

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository pktools.

commit 4cc16ce8fe136ad9d714770c8a99e720e1896477
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Mon Aug 11 23:54:13 2014 +0200

    Add support for libLAS 1.8.0
---
 debian/patches/latest_libLAS_support.patch | 34 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/latest_libLAS_support.patch b/debian/patches/latest_libLAS_support.patch
new file mode 100644
index 0000000..1f4aa2f
--- /dev/null
+++ b/debian/patches/latest_libLAS_support.patch
@@ -0,0 +1,34 @@
+From: Pieter Kempeneers <kempenep at gmail.com>
+Subject: liblas 1.8 support
+
+* src/apps/pkfilterdem.cc
+* src/apps/pklas2img.cc
+
+Origin: upstream, http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=7de3a2b42c92056bbf3f8a9e3ea2fb5ebf361bde
+Bug: https://savannah.nongnu.org/bugs/?42951
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757584
+
+--- pktools.orig/src/apps/pkfilterdem.cc
++++ pktools/src/apps/pkfilterdem.cc
+@@ -322,8 +322,9 @@
+       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;
+--- pktools.orig/src/apps/pklas2img.cc
++++ pktools/src/apps/pklas2img.cc
+@@ -282,7 +282,7 @@
+           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);
diff --git a/debian/patches/series b/debian/patches/series
index 0cdaa8e..5dc3ab2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+latest_libLAS_support.patch
 bandwidth-typo.patch
 automake-subdir-objects.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git