[pktools] 194/375: merged win to linux, commit from linux

[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 d7d7f6f496d6d7cd56e36f223c22c2c835f4daa0
Author: Default Seadas User <seadas-user at localhost>
Date:   Thu Mar 20 12:02:19 2014 +0100

    merged win to linux, commit from linux
---
 src/algorithms/StatFactory.h | 12 ++++++------
 src/apps/pklas2img.cc        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/algorithms/StatFactory.h b/src/algorithms/StatFactory.h
index bf2e602..ed053a7 100644
--- a/src/algorithms/StatFactory.h
+++ b/src/algorithms/StatFactory.h
@@ -139,13 +139,13 @@ public:
 
   template<class T> T mymin(const typename std::vector<T>& v) const;
   template<class T> T mymax(const typename std::vector<T>& v) const;
-  template<class T> T mymin(const typename std::vector<T>& v, typename T minConstraint) const;
-  template<class T> T mymax(const typename std::vector<T>& v, typename T maxConstraint) const;
+  template<class T> T mymin(const typename std::vector<T>& v, T minConstraint) const;
+  template<class T> T mymax(const typename std::vector<T>& v, T maxConstraint) const;
 //   template<class T> typename std::vector<T>::const_iterator mymax(const std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end) const;
   template<class T> typename std::vector<T>::const_iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end) const;
   template<class T> typename std::vector<T>::iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::iterator begin, typename std::vector<T>::iterator end) const;
-  template<class T> typename std::vector<T>::const_iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end, typename T minConstraint) const;
-  template<class T> typename std::vector<T>::iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::iterator begin, typename std::vector<T>::iterator end, typename T minConstraint) const;
+  template<class T> typename std::vector<T>::const_iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end, T minConstraint) const;
+  template<class T> typename std::vector<T>::iterator mymin(const typename std::vector<T>& v, typename std::vector<T>::iterator begin, typename std::vector<T>::iterator end, T minConstraint) const;
   template<class T> typename std::vector<T>::const_iterator mymax(const std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end) const;
   template<class T> typename std::vector<T>::iterator mymax(const std::vector<T>& v, typename std::vector<T>::iterator begin, typename std::vector<T>::iterator end) const;
   template<class T> typename std::vector<T>::const_iterator mymax(const std::vector<T>& v, typename std::vector<T>::const_iterator begin, typename std::vector<T>::const_iterator end, T maxConstraint) const;
@@ -315,7 +315,7 @@ template<class T> inline typename std::vector<T>::iterator StatFactory::mymax(co
 
 
 
-template<class T> inline typename T StatFactory::mymin(const std::vector<T>& v) const
+template<class T> inline T StatFactory::mymin(const std::vector<T>& v) const
 {
   T minValue=*(v.begin());
   for (typename std::vector<T>::const_iterator it = v.begin(); it!=v.end(); ++it){
@@ -327,7 +327,7 @@ template<class T> inline typename T StatFactory::mymin(const std::vector<T>& v)
   return minValue;
 }
 
- template<class T> inline typename T StatFactory::mymin(const std::vector<T>& v, T minConstraint) const
+ template<class T> inline T StatFactory::mymin(const std::vector<T>& v, T minConstraint) const
 {
   T minValue=minConstraint;
   for (typename std::vector<T>::const_iterator it = v.begin(); it!=v.end(); ++it){
diff --git a/src/apps/pklas2img.cc b/src/apps/pklas2img.cc
index 77aa6a0..293318a 100644
--- a/src/apps/pklas2img.cc
+++ b/src/apps/pklas2img.cc
@@ -352,9 +352,9 @@ int main(int argc,char **argv) {
       else{
         statfactory::StatFactory stat;
         if(composite_opt[0]=="min")
-          outputData[irow][icol]=stat.min(inputData[irow][icol]);
+          outputData[irow][icol]=stat.mymin(inputData[irow][icol]);
         else if(composite_opt[0]=="max")
-          outputData[irow][icol]=stat.max(inputData[irow][icol]);
+          outputData[irow][icol]=stat.mymax(inputData[irow][icol]);
         else if(composite_opt[0]=="median")
           outputData[irow][icol]=stat.median(inputData[irow][icol]);
         else if(composite_opt[0]=="mean")

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