[pktools] 260/375: fixed conflict pkextract.cc

[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 80f68b76171e66b088485e38466583ca6499c944
Merge: 7f33639 7cefa57
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Thu May 8 09:01:14 2014 +0200

    fixed conflict pkextract.cc

 src/apps/pkcomposite.cc          | 46 +++++++++----------
 src/apps/pkextract.cc            | 99 ++++++++++++++++++++++------------------
 src/imageclasses/ImgReaderGdal.h |  1 +
 3 files changed, 79 insertions(+), 67 deletions(-)

diff --cc src/apps/pkextract.cc
index b03a69f,71943f8..ef07e11
--- a/src/apps/pkextract.cc
+++ b/src/apps/pkextract.cc
@@@ -1688,11 -1694,6 +1694,7 @@@ int main(int argc, char *argv[]
  
  	    if(verbose_opt[0]>1)
  	      std::cout << "get centroid point from polygon" << std::endl;
- 	    if(ruleMap[rule_opt[0]]==rule::pointOnSurface){
- 	      string errorString="Error: pointOnSurface is not supported for multi polygons";
- 	      throw(errorString);
- 	    }
- 		
++
  	    readPolygon.Centroid(&writeCentroidPoint);
  
  	    double ulx,uly,lrx,lry;

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