[pktools] 231/375: resample option in pkcomposite similar to pkcrop

[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 05e5ada54894295c9827bc869defedadf48b86a5
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Wed Apr 2 18:46:31 2014 +0200

    resample option in pkcomposite similar to pkcrop
---
 src/apps/pkcomposite.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/apps/pkcomposite.cc b/src/apps/pkcomposite.cc
index eacf35f..e57d6e7 100644
--- a/src/apps/pkcomposite.cc
+++ b/src/apps/pkcomposite.cc
@@ -538,7 +538,7 @@ int main(int argc, char *argv[])
         double val_current=0;
         double val_new=0;
         bool readValid=true;
-        switch(resample_opt[0]){
+        switch(theResample){
         case(BILINEAR):
           lowerCol=readCol-0.5;
           lowerCol=static_cast<int>(lowerCol);
@@ -608,7 +608,7 @@ int main(int argc, char *argv[])
 	      double ndvi_new=0;
               double red_new=0;
               double nir_new=0;
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -653,7 +653,7 @@ int main(int argc, char *argv[])
             case(crule::minband):
             case(crule::validband)://max,min,valid band
               val_current=writeBuffer[ruleBand_opt[0]][ib];
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -692,7 +692,7 @@ int main(int argc, char *argv[])
               }
 	      break;
             case(crule::mode)://max voting (only for Byte images)
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -720,7 +720,7 @@ int main(int argc, char *argv[])
             case(crule::mean)://mean value
 	    case(crule::median)://median value
 	    case(crule::sum)://sum value
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -752,7 +752,7 @@ int main(int argc, char *argv[])
 	      break;
 	    case(crule::overwrite):
 	    default:
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -789,7 +789,7 @@ int main(int argc, char *argv[])
             case(crule::mean):
             case(crule::median):
             case(crule::sum):
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -817,7 +817,7 @@ int main(int argc, char *argv[])
               ++fileBuffer[ib];
               break;
             case(crule::mode):
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);
@@ -844,7 +844,7 @@ int main(int argc, char *argv[])
               }
               break;
             default:
-              switch(resample_opt[0]){
+              switch(theResample){
               case(BILINEAR):
                 lowerCol=readCol-0.5;
                 lowerCol=static_cast<int>(lowerCol);

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