[pktools] 263/375: cap both ul and lr pixel when reading block in pkextract

[Bas Couwenberg]

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 bf7f1a5547186c061607726b296804c91e657827
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Fri May 9 12:25:07 2014 +0200

    cap both ul and lr pixel when reading block in pkextract
---
 src/apps/pkextract.cc | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/apps/pkextract.cc b/src/apps/pkextract.cc
index ef506bc..a6aae69 100644
--- a/src/apps/pkextract.cc
+++ b/src/apps/pkextract.cc
@@ -1201,10 +1201,18 @@ int main(int argc, char *argv[])
 
 	    if(uli<0)
 	      uli=0;
+	    if(lri<0)
+	      lri=0;
+	    if(uli>=imgReader.nrOfCol())
+	      uli=imgReader.nrOfCol()-1;
 	    if(lri>=imgReader.nrOfCol())
 	      lri=imgReader.nrOfCol()-1;
 	    if(ulj<0)
 	      ulj=0;
+	    if(lrj<0)
+	      lrj=0;
+	    if(ulj>=imgReader.nrOfRow())
+	      ulj=imgReader.nrOfRow()-1;
 	    if(lrj>=imgReader.nrOfRow())
 	      lrj=imgReader.nrOfRow()-1;
 	    // if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||lrj>=imgReader.nrOfRow())
@@ -1746,10 +1754,18 @@ int main(int argc, char *argv[])
 
 	    if(uli<0)
 	      uli=0;
+	    if(lri<0)
+	      lri=0;
+	    if(uli>=imgReader.nrOfCol())
+	      uli=imgReader.nrOfCol()-1;
 	    if(lri>=imgReader.nrOfCol())
 	      lri=imgReader.nrOfCol()-1;
 	    if(ulj<0)
 	      ulj=0;
+	    if(lrj<0)
+	      lrj=0;
+	    if(ulj>=imgReader.nrOfRow())
+	      ulj=imgReader.nrOfRow()-1;
 	    if(lrj>=imgReader.nrOfRow())
 	      lrj=imgReader.nrOfRow()-1;
 	    // if(uli<0||lri>=imgReader.nrOfCol()||ulj<0||lrj>=imgReader.nrOfRow())

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