[pktools] 114/375: variance should be var in pkfilter, include for gdal without path in Optionpk.h

[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 6cd9a7d01af25cd8883ccad9300e9e601ed682c8
Author: user <user at osgeolive.(none)>
Date:   Wed May 22 09:46:11 2013 +0200

    variance should be var in pkfilter, include for gdal without path in Optionpk.h
---
 README               | 5 ++---
 src/apps/pkfilter.cc | 2 +-
 src/base/Makefile.am | 4 +++-
 src/base/Optionpk.h  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README b/README
index e92bbc6..a00e753 100644
--- a/README
+++ b/README
@@ -1,8 +1,7 @@
 Description of pktools
 ----------------------
-The version of this pktools distribution is 20120625
-pktools is a collection of programs written in C++ to perform operations on raster images.
-It heavily relies on the Geospatial Data Abstraction Library (GDAL, www.gdal.org) and OGR. Some of the programs are similar to the gdal tools (gdalinfo, gdal_translate, gdal_merge,...) and many of the functionalities provided in pktools already exist. The reason for implementing pktools is a combination of personal preference and in some case additional functionality. 
+The version of this pktools distribution is 2.4
+pktools is a collection of programs written in C++ to perform operations, mostly on raster images. It heavily relies on the Geospatial Data Abstraction Library (GDAL, http://www.gdal.org) and OGR. The programs are similar to the gdal tools (gdalinfo, gdal_translate, gdal_merge,...) and some of the functionalities provided in pktools already exist in the gdal tools. The reason for implementing pktools is a combination of personal preference and additional functionality.
 
 License and distribution
 ------------------------
diff --git a/src/apps/pkfilter.cc b/src/apps/pkfilter.cc
index 13e1d6a..246d28c 100644
--- a/src/apps/pkfilter.cc
+++ b/src/apps/pkfilter.cc
@@ -41,7 +41,7 @@ int main(int argc,char **argv) {
   Optionpk<std::string> output_opt("o", "output", "Output image file");
   Optionpk<bool> disc_opt("c", "circular", "circular disc kernel for dilation and erosion", false);
   Optionpk<double> angle_opt("a", "angle", "angle used for directional filtering in dilation (North=0, East=90, South=180, West=270).");
-  Optionpk<std::string> method_opt("f", "filter", "filter function (median,variance,min,max,sum,mean,minmax,dilate,erode,close,open,spatially homogeneous (central pixel must be identical to all other pixels within window),SobelX edge detection in X,SobelY edge detection in Y,SobelXY,SobelYX,smooth,density,majority voting (only for classes),forest aggregation (mixed),smooth no data (mask) values,threshold local filtering,ismin,ismax,heterogeneous (central pixel must be different than all  [...]
+  Optionpk<std::string> method_opt("f", "filter", "filter function (median,var,min,max,sum,mean,minmax,dilate,erode,close,open,spatially homogeneous (central pixel must be identical to all other pixels within window),SobelX edge detection in X,SobelY edge detection in Y,SobelXY,SobelYX,smooth,density,majority voting (only for classes),forest aggregation (mixed),smooth no data (mask) values,threshold local filtering,ismin,ismax,heterogeneous (central pixel must be different than all other [...]
   Optionpk<int> dimX_opt("dx", "dx", "filter kernel size in x, must be odd", 3);
   Optionpk<int> dimY_opt("dy", "dy", "filter kernel size in y, must be odd", 3);
   Optionpk<int> dimZ_opt("dz", "dz", "filter kernel size in z (band or spectral dimension), must be odd (example: 3).. Set dz>0 if 1-D filter must be used in band domain");
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 8b3c698..efde6a4 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -7,7 +7,9 @@
 noinst_PROGRAMS = pktestOption  
 
 # additional include pathes necessary to compile the C++ library
-AM_CXXFLAGS = -I$(top_srcdir)/src @AM_CXXFLAGS@
+AM_LDFLAGS = $(GDAL_LDFLAGS) @AM_LDFLAGS@
+AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
+#AM_CXXFLAGS = -I$(top_srcdir)/src @AM_CXXFLAGS@
 
 ###############################################################################
 # THE LIBRARIES TO BUILD
diff --git a/src/base/Optionpk.h b/src/base/Optionpk.h
index fd0922f..22329e7 100644
--- a/src/base/Optionpk.h
+++ b/src/base/Optionpk.h
@@ -29,7 +29,7 @@ along with pktools.  If not, see <http://www.gnu.org/licenses/>.
 #include <iomanip>
 #include <sstream>
 #include <typeinfo>
-#include "gdal/ogr_feature.h"
+#include "ogr_feature.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

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