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 d0b39e85804d8585400d87b14dc1ce74e9f7dc36
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Fri May 9 07:00:44 2014 +0200
cap boundary of polygon enveloppe when reading datablock for pkextract.cc
---
src/apps/pkextract.cc | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/apps/pkextract.cc b/src/apps/pkextract.cc
index 4f78466..ef506bc 100644
--- a/src/apps/pkextract.cc
+++ b/src/apps/pkextract.cc
@@ -1199,8 +1199,16 @@ int main(int argc, char *argv[])
if(verbose_opt[0]>1)
std::cout << "bounding box for polygon feature " << ifeature <<
": " << uli << " " << ulj << " " << lri << " " << lrj << std::endl;
- if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||ulj>=imgReader.nrOfRow())
- continue;
+ if(uli<0)
+ uli=0;
+ if(lri>=imgReader.nrOfCol())
+ lri=imgReader.nrOfCol()-1;
+ if(ulj<0)
+ ulj=0;
+ if(lrj>=imgReader.nrOfRow())
+ lrj=imgReader.nrOfRow()-1;
+ //
if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||lrj>=imgReader.nrOfRow())
+ // continue;
int nPointPolygon=0;
@@ -1736,8 +1744,16 @@ int main(int argc, char *argv[])
if(verbose_opt[0]>1)
std::cout << "bounding box for feature " << ifeature << ": " <<
uli << " " << ulj << " " << lri << " " << lrj << std::endl;
- if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||ulj>=imgReader.nrOfRow())
- continue;
+ if(uli<0)
+ uli=0;
+ if(lri>=imgReader.nrOfCol())
+ lri=imgReader.nrOfCol()-1;
+ if(ulj<0)
+ ulj=0;
+ if(lrj>=imgReader.nrOfRow())
+ lrj=imgReader.nrOfRow()-1;
+ //
if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||lrj>=imgReader.nrOfRow())
+ // continue;
int nPointPolygon=0;
if(polygon_opt[0]){
--
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
