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 46acc25d0932eb00d039ade68b45de5ee7c3f605
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Tue Jan 29 18:03:58 2013 +0100
support of polygons in ImgReaderOgr::readData and in pkclassify_svm
---
ChangeLog | 3 +
Makefile.in | 83 +++++-------
aclocal.m4 | 82 +++++-------
configure | 270 +++++++++++++++++----------------------
src/algorithms/Makefile.in | 31 ++---
src/apps/Makefile.in | 77 ++++++-----
src/apps/pkclassify_svm.cc | 120 ++++++++---------
src/apps/pkdumpogr.cc | 5 +-
src/apps/pkextract.cc | 8 +-
src/apps/pkinfo.cc | 199 ++++++++++++-----------------
src/base/Makefile.in | 31 ++---
src/base/Optionpk.h | 164 ++++++++++++++----------
src/fileclasses/Makefile.in | 31 ++---
src/imageclasses/ImgReaderOgr.cc | 32 ++---
src/imageclasses/ImgReaderOgr.h | 84 +++++++-----
src/imageclasses/ImgWriterOgr.cc | 2 +-
src/imageclasses/Makefile.in | 31 ++---
17 files changed, 564 insertions(+), 689 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e622377..cda89b6 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,8 @@ version 2.4
support filtering of matrix (doit with Vector2d arguments) (to create
DTM according to P. Bunting)
- FileReaderLas
support class filters
+ - ImgReaderGdal.h
+ support of polygons in readData
- ImgReaderGdal.cc
in addition to internal setNoData member variable, also support
GDALSetNoData
- ImgWriterGdal.cc
@@ -76,6 +78,7 @@ version 2.4
do not output input file if no input data was defined in verbose mode
update of header information
adding some short options
+ support of polygon ogr input file
- pkclassify_nn
support of cross validation
adding some short options
diff --git a/Makefile.in b/Makefile.in
index 79e3881..7146fbd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -68,11 +68,9 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS)
$(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
- || { sleep 5 && rm -rf "$(distdir)"; }; \
- else :; fi
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -101,8 +99,6 @@ am__relativize = \
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -229,7 +225,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-am--refresh: Makefile
+am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -265,8 +261,10 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -486,11 +484,7 @@ dist-gzip: distdir
$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c
>$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-lzip: distdir
- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9}
>$(distdir).tar.lz
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-lzma: distdir
@@ -498,7 +492,7 @@ dist-lzma: distdir
$(am__remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c
>$(distdir).tar.xz
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(am__remove_distdir)
dist-tarZ: distdir
@@ -529,8 +523,6 @@ distcheck: dist
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.lz*) \
- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -550,7 +542,6 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -579,16 +570,8 @@ distcheck: dist
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
- '$$(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- $(am__cd) '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ @$(am__cd) '$(distuninstallcheck_dir)' \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -619,15 +602,10 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
@@ -714,18 +692,17 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/aclocal.m4 b/aclocal.m4
index 1785447..1f01ab1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
@@ -48,8 +47,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search
path])
@@ -95,8 +93,7 @@ m4_define([_PKG_CONFIG],
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes ],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -144,9 +141,9 @@ if test $pkg_failed = yes; then
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -180,15 +177,12 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation,
Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -198,7 +192,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -214,21 +208,19 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -310,14 +302,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -357,7 +349,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -422,7 +413,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -487,13 +478,10 @@ AC_DEFUN([AM_DEP_TRACK],
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -715,15 +703,12 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg"
>`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
@@ -855,15 +840,12 @@ else
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_MKDIR_P
# ---------------
# Check for `mkdir -p'.
@@ -886,14 +868,13 @@ esac
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
+# serial 4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -901,13 +882,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# --------------------
+# ------------------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
+# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -983,14 +964,12 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 1
-
# AM_PROG_INSTALL_STRIP
# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
@@ -1013,13 +992,13 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 3
+# serial 2
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
@@ -1028,13 +1007,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
+# ---------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1056,11 +1035,10 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# a tarball read from stdin.
# $(am__untar) < result.tar
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
m4_if([$1], [v7],
- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
[m4_case([$1], [ustar],, [pax],,
[m4_fatal([Unknown tar format])])
AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/configure b/configure
index f111ad9..5ea37c6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for pktools 2.4.
+# Generated by GNU Autoconf 2.67 for pktools 2.4.
#
# Report bugs to <kempe...@gmail.com>.
#
@@ -91,7 +91,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -217,18 +216,11 @@ IFS=$as_save_IFS
# We cannot yet assume a decent shell, so we have to provide a
# neutralization value for shells without unset; and this also
# works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
@@ -640,7 +632,6 @@ RANLIB
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
CXXDEPMODE
-am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -1156,7 +1147,7 @@ Try \`$0 --help' for more information"
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : "${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}"
+ : ${build_alias=$ac_option} ${host_alias=$ac_option}
${target_alias=$ac_option}
;;
esac
@@ -1471,7 +1462,7 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
pktools configure 2.4
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -1517,7 +1508,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_compile
@@ -1555,7 +1546,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -1592,7 +1583,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -1605,10 +1596,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1675,7 +1666,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the
compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -1684,7 +1675,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_header_mongrel
@@ -1725,7 +1716,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -1739,7 +1730,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1757,7 +1748,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_c_check_header_compile
@@ -1793,7 +1784,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_cpp
@@ -1835,7 +1826,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
as_fn_set_status $ac_retval
} # ac_fn_cxx_try_run
@@ -1848,10 +1839,10 @@ fi
ac_fn_cxx_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
+ if eval "test \"\${$3+set}\"" = set; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
@@ -1918,7 +1909,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the
compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
@@ -1927,7 +1918,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_cxx_check_header_mongrel
@@ -1940,7 +1931,7 @@ ac_fn_cxx_check_type ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
eval "$3=no"
@@ -1981,7 +1972,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset
as_lineno;}
} # ac_fn_cxx_check_type
cat >config.log <<_ACEOF
@@ -1989,7 +1980,7 @@ This file contains any messages produced by compilers
while
running configure, to aid debugging if configure makes a mistake.
It was created by pktools $as_me 2.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2247,7 +2238,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
|| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
done
@@ -2384,7 +2375,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please
don't use this var.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible
install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2471,11 +2462,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
esac
# Do `set' in a subshell so we don't clobber the current shell's
@@ -2561,7 +2552,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
@@ -2601,7 +2592,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
@@ -2654,7 +2645,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p"
>&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
+ if test "${ac_cv_path_mkdir+set}" = set; then :
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2705,7 +2696,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
@@ -2745,7 +2736,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
@@ -2833,11 +2824,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
@@ -2859,7 +2850,7 @@ fi
set dummy gdal-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDAL_CONFIG+:} false; then :
+if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GDAL_CONFIG in
@@ -2900,7 +2891,7 @@ else
set dummy gdal-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDAL_CONFIG+:} false; then :
+if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GDAL_CONFIG in
@@ -3066,7 +3057,7 @@ if test -z "$CXX"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
+if test "${ac_cv_prog_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
@@ -3110,7 +3101,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
@@ -3274,7 +3265,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -3317,7 +3308,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3376,7 +3367,7 @@ $as_echo "$ac_try_echo"; } >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run C++ compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
fi
fi
@@ -3387,7 +3378,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files"
>&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3428,7 +3419,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -3438,7 +3429,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU
C++ compiler" >&5
$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3475,7 +3466,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3608,7 +3599,6 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -3624,7 +3614,7 @@ depcc="$CXX" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc"
>&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3633,7 +3623,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -3693,7 +3682,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -3753,7 +3742,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
@@ -3793,7 +3782,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
@@ -3858,7 +3847,7 @@ fi
set dummy gdal-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDAL_CONFIG+:} false; then :
+if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GDAL_CONFIG in
@@ -3899,7 +3888,7 @@ else
set dummy gdal-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDAL_CONFIG+:} false; then :
+if test "${ac_cv_path_GDAL_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $GDAL_CONFIG in
@@ -4043,7 +4032,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4083,7 +4072,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4136,7 +4125,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4176,7 +4165,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4235,7 +4224,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
@@ -4279,7 +4268,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
@@ -4334,7 +4323,7 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in
\`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4363,7 +4352,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU
C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4400,7 +4389,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4478,7 +4467,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO
C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
@@ -4577,7 +4566,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc"
>&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4586,7 +4575,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4646,7 +4634,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -4714,7 +4702,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
+ if test "${ac_cv_prog_CPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
@@ -4830,7 +4818,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
@@ -4842,7 +4830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long
lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
@@ -4905,7 +4893,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4972,7 +4960,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5102,7 +5090,7 @@ done
for ac_header in gdal.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "gdal.h" "ac_cv_header_gdal_h"
"$ac_includes_default"
-if test "x$ac_cv_header_gdal_h" = xyes; then :
+if test "x$ac_cv_header_gdal_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_GDAL_H 1
_ACEOF
@@ -5124,14 +5112,13 @@ fi
-
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
@@ -5174,7 +5161,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
@@ -5255,7 +5242,6 @@ if test -n "$FANN_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FANN_CFLAGS=`$PKG_CONFIG --cflags "fann >= 2.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5272,7 +5258,6 @@ if test -n "$FANN_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FANN_LIBS=`$PKG_CONFIG --libs "fann >= 2.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5292,9 +5277,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FANN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "fann >= 2.1.0" 2>&1`
+ FANN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"fann >= 2.1.0" 2>&1`
else
- FANN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"fann >= 2.1.0" 2>&1`
+ FANN_PKG_ERRORS=`$PKG_CONFIG --print-errors "fann >= 2.1.0"
2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FANN_PKG_ERRORS" >&5
@@ -5398,7 +5383,6 @@ if test -n "$NLOPT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NLOPT_CFLAGS=`$PKG_CONFIG --cflags "nlopt >= 2.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5415,7 +5399,6 @@ if test -n "$NLOPT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_NLOPT_LIBS=`$PKG_CONFIG --libs "nlopt >= 2.1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5435,9 +5418,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NLOPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "nlopt >= 2.1.0" 2>&1`
+ NLOPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"nlopt >= 2.1.0" 2>&1`
else
- NLOPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"nlopt >= 2.1.0" 2>&1`
+ NLOPT_PKG_ERRORS=`$PKG_CONFIG --print-errors "nlopt >= 2.1.0"
2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NLOPT_PKG_ERRORS" >&5
@@ -5496,7 +5479,6 @@ if test -n "$GSL_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSL_CFLAGS=`$PKG_CONFIG --cflags "gsl >= 1.14" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5513,7 +5495,6 @@ if test -n "$GSL_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GSL_LIBS=`$PKG_CONFIG --libs "gsl >= 1.14" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -5533,9 +5514,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "gsl >= 1.14" 2>&1`
+ GSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gsl
>= 1.14" 2>&1`
else
- GSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gsl
>= 1.14" 2>&1`
+ GSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gsl >= 1.14" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSL_PKG_ERRORS" >&5
@@ -5579,7 +5560,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++
preprocessor" >&5
$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
if test -z "$CXXCPP"; then
- if ${ac_cv_prog_CXXCPP+:} false; then :
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
@@ -5695,7 +5676,7 @@ else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=cpp
@@ -5707,7 +5688,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5820,7 +5801,7 @@ fi
for ac_header in string
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "string" "ac_cv_header_string"
"$ac_includes_default"
-if test "x$ac_cv_header_string" = xyes; then :
+if test "x$ac_cv_header_string" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_STRING 1
_ACEOF
@@ -5832,7 +5813,7 @@ done
for ac_header in iostream
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "iostream" "ac_cv_header_iostream"
"$ac_includes_default"
-if test "x$ac_cv_header_iostream" = xyes; then :
+if test "x$ac_cv_header_iostream" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_IOSTREAM 1
_ACEOF
@@ -5844,7 +5825,7 @@ done
# Checks for typedefs, structures, and compiler characteristics.
ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t"
"$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
else
@@ -5932,21 +5913,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var
contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
- if test "x$cache_file" != "x/dev/null"; then
+ test "x$cache_file" != "x/dev/null" &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
$as_echo "$as_me: updating cache $cache_file" >&6;}
- if test ! -f "$cache_file" || test -h "$cache_file"; then
- cat confcache >"$cache_file"
- else
- case $cache_file in #(
- */* | ?:*)
- mv -f confcache "$cache_file"$$ &&
- mv -f "$cache_file"$$ "$cache_file" ;; #(
- *)
- mv -f confcache "$cache_file" ;;
- esac
- fi
- fi
+ cat confcache >$cache_file
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache
$cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -6026,7 +5996,7 @@ if test -z "${USE_GSL_TRUE}" && test -z
"${USE_GSL_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -6127,7 +6097,6 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-as_myself=
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6435,7 +6404,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by pktools $as_me 2.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6501,7 +6470,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
pktools config.status 2.4
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -6638,7 +6607,7 @@ do
"src/fileclasses/Makefile") CONFIG_FILES="$CONFIG_FILES
src/fileclasses/Makefile" ;;
"src/apps/Makefile") CONFIG_FILES="$CONFIG_FILES src/apps/Makefile" ;;
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
@@ -6661,10 +6630,9 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- tmp= ac_tmp=
+ tmp=
trap 'exit_status=$?
- : "${ac_tmp:=$tmp}"
- { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
@@ -6672,13 +6640,12 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -d "$tmp"
+ test -n "$tmp" && test -d "$tmp"
} ||
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
@@ -6700,7 +6667,7 @@ else
ac_cs_awk_cr=$ac_cr
fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
@@ -6728,7 +6695,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
sed -n '
h
@@ -6776,7 +6743,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
for (key in S) S_is_set[key] = 1
FS = ""
@@ -6808,7 +6775,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
@@ -6842,7 +6809,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
BEGIN {
_ACEOF
@@ -6854,8 +6821,8 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
- ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- if test -z "$ac_tt"; then
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -6956,7 +6923,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
@@ -6975,7 +6942,7 @@ do
for ac_f
do
case $ac_f in
- -) ac_f="$ac_tmp/stdin";;
+ -) ac_f="$tmp/stdin";;
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be
DOS-style,
# because $ac_f cannot contain `:'.
@@ -6984,7 +6951,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;;
esac
as_fn_append ac_file_inputs " '$ac_f'"
@@ -7010,8 +6977,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
- *:-:* | *:-) cat >"$ac_tmp/stdin" \
- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
@@ -7147,22 +7114,21 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk"
>$tmp/out \
+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- "$ac_tmp/out"`; test -z "$ac_out"; } &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z
"$ac_out"; } &&
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a
reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable
\`datarootdir'
which seems to be undefined. Please make sure it is defined" >&2;}
- rm -f "$ac_tmp/stdin"
+ rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
@@ -7173,20 +7139,20 @@ which seems to be undefined. Please make sure it is
defined" >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- } >"$ac_tmp/config.h" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
- if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
rm -f "$ac_file"
- mv "$ac_tmp/config.h" "$ac_file" \
+ mv "$tmp/config.h" "$ac_file" \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
- && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
|| as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
diff --git a/src/algorithms/Makefile.in b/src/algorithms/Makefile.in
index 7fbe33b..bb2bb97 100644
--- a/src/algorithms/Makefile.in
+++ b/src/algorithms/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -101,12 +101,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(libalgorithms_adir)"
HEADERS = $(libalgorithms_a_HEADERS)
ETAGS = etags
@@ -277,7 +271,7 @@ $(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libalgorithms.a: $(libalgorithms_a_OBJECTS) $(libalgorithms_a_DEPENDENCIES)
$(EXTRA_libalgorithms_a_DEPENDENCIES)
+libalgorithms.a: $(libalgorithms_a_OBJECTS) $(libalgorithms_a_DEPENDENCIES)
-rm -f libalgorithms.a
$(libalgorithms_a_AR) libalgorithms.a $(libalgorithms_a_OBJECTS)
$(libalgorithms_a_LIBADD)
$(RANLIB) libalgorithms.a
@@ -339,7 +333,9 @@ uninstall-libalgorithms_aHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(libalgorithms_a_HEADERS)'; test -n "$(libalgorithms_adir)" ||
list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libalgorithms_adir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libalgorithms_adir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libalgorithms_adir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -440,15 +436,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/src/apps/Makefile.in b/src/apps/Makefile.in
index e64f34e..926267c 100644
--- a/src/apps/Makefile.in
+++ b/src/apps/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -501,91 +501,91 @@ uninstall-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-pkascii2img$(EXEEXT): $(pkascii2img_OBJECTS) $(pkascii2img_DEPENDENCIES)
$(EXTRA_pkascii2img_DEPENDENCIES)
+pkascii2img$(EXEEXT): $(pkascii2img_OBJECTS) $(pkascii2img_DEPENDENCIES)
@rm -f pkascii2img$(EXEEXT)
$(CXXLINK) $(pkascii2img_OBJECTS) $(pkascii2img_LDADD) $(LIBS)
-pkascii2ogr$(EXEEXT): $(pkascii2ogr_OBJECTS) $(pkascii2ogr_DEPENDENCIES)
$(EXTRA_pkascii2ogr_DEPENDENCIES)
+pkascii2ogr$(EXEEXT): $(pkascii2ogr_OBJECTS) $(pkascii2ogr_DEPENDENCIES)
@rm -f pkascii2ogr$(EXEEXT)
$(CXXLINK) $(pkascii2ogr_OBJECTS) $(pkascii2ogr_LDADD) $(LIBS)
-pkclassify_nn$(EXEEXT): $(pkclassify_nn_OBJECTS) $(pkclassify_nn_DEPENDENCIES)
$(EXTRA_pkclassify_nn_DEPENDENCIES)
+pkclassify_nn$(EXEEXT): $(pkclassify_nn_OBJECTS) $(pkclassify_nn_DEPENDENCIES)
@rm -f pkclassify_nn$(EXEEXT)
$(pkclassify_nn_LINK) $(pkclassify_nn_OBJECTS) $(pkclassify_nn_LDADD)
$(LIBS)
-pkclassify_svm$(EXEEXT): $(pkclassify_svm_OBJECTS)
$(pkclassify_svm_DEPENDENCIES) $(EXTRA_pkclassify_svm_DEPENDENCIES)
+pkclassify_svm$(EXEEXT): $(pkclassify_svm_OBJECTS)
$(pkclassify_svm_DEPENDENCIES)
@rm -f pkclassify_svm$(EXEEXT)
$(CXXLINK) $(pkclassify_svm_OBJECTS) $(pkclassify_svm_LDADD) $(LIBS)
-pkcreatect$(EXEEXT): $(pkcreatect_OBJECTS) $(pkcreatect_DEPENDENCIES)
$(EXTRA_pkcreatect_DEPENDENCIES)
+pkcreatect$(EXEEXT): $(pkcreatect_OBJECTS) $(pkcreatect_DEPENDENCIES)
@rm -f pkcreatect$(EXEEXT)
$(CXXLINK) $(pkcreatect_OBJECTS) $(pkcreatect_LDADD) $(LIBS)
-pkcrop$(EXEEXT): $(pkcrop_OBJECTS) $(pkcrop_DEPENDENCIES)
$(EXTRA_pkcrop_DEPENDENCIES)
+pkcrop$(EXEEXT): $(pkcrop_OBJECTS) $(pkcrop_DEPENDENCIES)
@rm -f pkcrop$(EXEEXT)
$(CXXLINK) $(pkcrop_OBJECTS) $(pkcrop_LDADD) $(LIBS)
-pkdiff$(EXEEXT): $(pkdiff_OBJECTS) $(pkdiff_DEPENDENCIES)
$(EXTRA_pkdiff_DEPENDENCIES)
+pkdiff$(EXEEXT): $(pkdiff_OBJECTS) $(pkdiff_DEPENDENCIES)
@rm -f pkdiff$(EXEEXT)
$(CXXLINK) $(pkdiff_OBJECTS) $(pkdiff_LDADD) $(LIBS)
-pkdsm2shadow$(EXEEXT): $(pkdsm2shadow_OBJECTS) $(pkdsm2shadow_DEPENDENCIES)
$(EXTRA_pkdsm2shadow_DEPENDENCIES)
+pkdsm2shadow$(EXEEXT): $(pkdsm2shadow_OBJECTS) $(pkdsm2shadow_DEPENDENCIES)
@rm -f pkdsm2shadow$(EXEEXT)
$(CXXLINK) $(pkdsm2shadow_OBJECTS) $(pkdsm2shadow_LDADD) $(LIBS)
-pkdumpimg$(EXEEXT): $(pkdumpimg_OBJECTS) $(pkdumpimg_DEPENDENCIES)
$(EXTRA_pkdumpimg_DEPENDENCIES)
+pkdumpimg$(EXEEXT): $(pkdumpimg_OBJECTS) $(pkdumpimg_DEPENDENCIES)
@rm -f pkdumpimg$(EXEEXT)
$(CXXLINK) $(pkdumpimg_OBJECTS) $(pkdumpimg_LDADD) $(LIBS)
-pkdumpogr$(EXEEXT): $(pkdumpogr_OBJECTS) $(pkdumpogr_DEPENDENCIES)
$(EXTRA_pkdumpogr_DEPENDENCIES)
+pkdumpogr$(EXEEXT): $(pkdumpogr_OBJECTS) $(pkdumpogr_DEPENDENCIES)
@rm -f pkdumpogr$(EXEEXT)
$(CXXLINK) $(pkdumpogr_OBJECTS) $(pkdumpogr_LDADD) $(LIBS)
-pkegcs$(EXEEXT): $(pkegcs_OBJECTS) $(pkegcs_DEPENDENCIES)
$(EXTRA_pkegcs_DEPENDENCIES)
+pkegcs$(EXEEXT): $(pkegcs_OBJECTS) $(pkegcs_DEPENDENCIES)
@rm -f pkegcs$(EXEEXT)
$(CXXLINK) $(pkegcs_OBJECTS) $(pkegcs_LDADD) $(LIBS)
-pkextract$(EXEEXT): $(pkextract_OBJECTS) $(pkextract_DEPENDENCIES)
$(EXTRA_pkextract_DEPENDENCIES)
+pkextract$(EXEEXT): $(pkextract_OBJECTS) $(pkextract_DEPENDENCIES)
@rm -f pkextract$(EXEEXT)
$(CXXLINK) $(pkextract_OBJECTS) $(pkextract_LDADD) $(LIBS)
-pkfillnodata$(EXEEXT): $(pkfillnodata_OBJECTS) $(pkfillnodata_DEPENDENCIES)
$(EXTRA_pkfillnodata_DEPENDENCIES)
+pkfillnodata$(EXEEXT): $(pkfillnodata_OBJECTS) $(pkfillnodata_DEPENDENCIES)
@rm -f pkfillnodata$(EXEEXT)
$(CXXLINK) $(pkfillnodata_OBJECTS) $(pkfillnodata_LDADD) $(LIBS)
-pkfilter$(EXEEXT): $(pkfilter_OBJECTS) $(pkfilter_DEPENDENCIES)
$(EXTRA_pkfilter_DEPENDENCIES)
+pkfilter$(EXEEXT): $(pkfilter_OBJECTS) $(pkfilter_DEPENDENCIES)
@rm -f pkfilter$(EXEEXT)
$(CXXLINK) $(pkfilter_OBJECTS) $(pkfilter_LDADD) $(LIBS)
-pkfs_nn$(EXEEXT): $(pkfs_nn_OBJECTS) $(pkfs_nn_DEPENDENCIES)
$(EXTRA_pkfs_nn_DEPENDENCIES)
+pkfs_nn$(EXEEXT): $(pkfs_nn_OBJECTS) $(pkfs_nn_DEPENDENCIES)
@rm -f pkfs_nn$(EXEEXT)
$(pkfs_nn_LINK) $(pkfs_nn_OBJECTS) $(pkfs_nn_LDADD) $(LIBS)
-pkfs_svm$(EXEEXT): $(pkfs_svm_OBJECTS) $(pkfs_svm_DEPENDENCIES)
$(EXTRA_pkfs_svm_DEPENDENCIES)
+pkfs_svm$(EXEEXT): $(pkfs_svm_OBJECTS) $(pkfs_svm_DEPENDENCIES)
@rm -f pkfs_svm$(EXEEXT)
$(CXXLINK) $(pkfs_svm_OBJECTS) $(pkfs_svm_LDADD) $(LIBS)
-pkgetmask$(EXEEXT): $(pkgetmask_OBJECTS) $(pkgetmask_DEPENDENCIES)
$(EXTRA_pkgetmask_DEPENDENCIES)
+pkgetmask$(EXEEXT): $(pkgetmask_OBJECTS) $(pkgetmask_DEPENDENCIES)
@rm -f pkgetmask$(EXEEXT)
$(CXXLINK) $(pkgetmask_OBJECTS) $(pkgetmask_LDADD) $(LIBS)
-pkinfo$(EXEEXT): $(pkinfo_OBJECTS) $(pkinfo_DEPENDENCIES)
$(EXTRA_pkinfo_DEPENDENCIES)
+pkinfo$(EXEEXT): $(pkinfo_OBJECTS) $(pkinfo_DEPENDENCIES)
@rm -f pkinfo$(EXEEXT)
$(CXXLINK) $(pkinfo_OBJECTS) $(pkinfo_LDADD) $(LIBS)
-pklas2img$(EXEEXT): $(pklas2img_OBJECTS) $(pklas2img_DEPENDENCIES)
$(EXTRA_pklas2img_DEPENDENCIES)
+pklas2img$(EXEEXT): $(pklas2img_OBJECTS) $(pklas2img_DEPENDENCIES)
@rm -f pklas2img$(EXEEXT)
$(CXXLINK) $(pklas2img_OBJECTS) $(pklas2img_LDADD) $(LIBS)
-pkmosaic$(EXEEXT): $(pkmosaic_OBJECTS) $(pkmosaic_DEPENDENCIES)
$(EXTRA_pkmosaic_DEPENDENCIES)
+pkmosaic$(EXEEXT): $(pkmosaic_OBJECTS) $(pkmosaic_DEPENDENCIES)
@rm -f pkmosaic$(EXEEXT)
$(CXXLINK) $(pkmosaic_OBJECTS) $(pkmosaic_LDADD) $(LIBS)
-pkndvi$(EXEEXT): $(pkndvi_OBJECTS) $(pkndvi_DEPENDENCIES)
$(EXTRA_pkndvi_DEPENDENCIES)
+pkndvi$(EXEEXT): $(pkndvi_OBJECTS) $(pkndvi_DEPENDENCIES)
@rm -f pkndvi$(EXEEXT)
$(CXXLINK) $(pkndvi_OBJECTS) $(pkndvi_LDADD) $(LIBS)
-pkopt_svm$(EXEEXT): $(pkopt_svm_OBJECTS) $(pkopt_svm_DEPENDENCIES)
$(EXTRA_pkopt_svm_DEPENDENCIES)
+pkopt_svm$(EXEEXT): $(pkopt_svm_OBJECTS) $(pkopt_svm_DEPENDENCIES)
@rm -f pkopt_svm$(EXEEXT)
$(CXXLINK) $(pkopt_svm_OBJECTS) $(pkopt_svm_LDADD) $(LIBS)
-pkpolygonize$(EXEEXT): $(pkpolygonize_OBJECTS) $(pkpolygonize_DEPENDENCIES)
$(EXTRA_pkpolygonize_DEPENDENCIES)
+pkpolygonize$(EXEEXT): $(pkpolygonize_OBJECTS) $(pkpolygonize_DEPENDENCIES)
@rm -f pkpolygonize$(EXEEXT)
$(CXXLINK) $(pkpolygonize_OBJECTS) $(pkpolygonize_LDADD) $(LIBS)
-pkreclass$(EXEEXT): $(pkreclass_OBJECTS) $(pkreclass_DEPENDENCIES)
$(EXTRA_pkreclass_DEPENDENCIES)
+pkreclass$(EXEEXT): $(pkreclass_OBJECTS) $(pkreclass_DEPENDENCIES)
@rm -f pkreclass$(EXEEXT)
$(CXXLINK) $(pkreclass_OBJECTS) $(pkreclass_LDADD) $(LIBS)
-pksensormodel$(EXEEXT): $(pksensormodel_OBJECTS) $(pksensormodel_DEPENDENCIES)
$(EXTRA_pksensormodel_DEPENDENCIES)
+pksensormodel$(EXEEXT): $(pksensormodel_OBJECTS) $(pksensormodel_DEPENDENCIES)
@rm -f pksensormodel$(EXEEXT)
$(CXXLINK) $(pksensormodel_OBJECTS) $(pksensormodel_LDADD) $(LIBS)
-pksetmask$(EXEEXT): $(pksetmask_OBJECTS) $(pksetmask_DEPENDENCIES)
$(EXTRA_pksetmask_DEPENDENCIES)
+pksetmask$(EXEEXT): $(pksetmask_OBJECTS) $(pksetmask_DEPENDENCIES)
@rm -f pksetmask$(EXEEXT)
$(CXXLINK) $(pksetmask_OBJECTS) $(pksetmask_LDADD) $(LIBS)
-pksieve$(EXEEXT): $(pksieve_OBJECTS) $(pksieve_DEPENDENCIES)
$(EXTRA_pksieve_DEPENDENCIES)
+pksieve$(EXEEXT): $(pksieve_OBJECTS) $(pksieve_DEPENDENCIES)
@rm -f pksieve$(EXEEXT)
$(CXXLINK) $(pksieve_OBJECTS) $(pksieve_LDADD) $(LIBS)
-pkstat$(EXEEXT): $(pkstat_OBJECTS) $(pkstat_DEPENDENCIES)
$(EXTRA_pkstat_DEPENDENCIES)
+pkstat$(EXEEXT): $(pkstat_OBJECTS) $(pkstat_DEPENDENCIES)
@rm -f pkstat$(EXEEXT)
$(CXXLINK) $(pkstat_OBJECTS) $(pkstat_LDADD) $(LIBS)
-pkstatogr$(EXEEXT): $(pkstatogr_OBJECTS) $(pkstatogr_DEPENDENCIES)
$(EXTRA_pkstatogr_DEPENDENCIES)
+pkstatogr$(EXEEXT): $(pkstatogr_OBJECTS) $(pkstatogr_DEPENDENCIES)
@rm -f pkstatogr$(EXEEXT)
$(CXXLINK) $(pkstatogr_OBJECTS) $(pkstatogr_LDADD) $(LIBS)
@@ -795,15 +795,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/src/apps/pkclassify_svm.cc b/src/apps/pkclassify_svm.cc
index 94139de..e35bc40 100644
--- a/src/apps/pkclassify_svm.cc
+++ b/src/apps/pkclassify_svm.cc
@@ -30,10 +30,6 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
#include "algorithms/svm.h"
#include "pkclassify_nn.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#define Malloc(type,n) (type *)malloc((n)*sizeof(type))
void reclass(const vector<double>& result, const vector<int>& vreclass, const
vector<double>& priors, unsigned short aggregation, vector<float>&
theResultReclass);
@@ -91,16 +87,6 @@ int main(int argc, char *argv[])
//--------------------------- command line options
------------------------------------
- std::string versionString="version ";
- versionString+=VERSION;
- versionString+=", Copyright (C) 2008-2012 Pieter Kempeneers.\n\
- This program comes with ABSOLUTELY NO WARRANTY; for details type use option
-h.\n\
- This is free software, and you are welcome to redistribute it\n\
- under certain conditions; use option --license for details.";
- Optionpk<bool> version_opt("\0","version",versionString,false);
- Optionpk<bool> license_opt("lic","license","show license information",false);
- Optionpk<bool> help_opt("h","help","shows this help info",false);
- Optionpk<bool> todo_opt("\0","todo","",false);
Optionpk<string> input_opt("i", "input", "input image");
Optionpk<string> training_opt("t", "training", "training shape file. A
single shape file contains all training features (must be set as: B0, B1,
B2,...) for all classes (class numbers identified by label option). Use
multiple training files for bootstrap aggregation (alternative to the bag and
bsize options, where a random subset is taken from a single training file)");
Optionpk<string> label_opt("label", "label", "identifier for class label in
training shape file.","label");
@@ -142,63 +128,55 @@ int main(int argc, char *argv[])
Optionpk<string> prob_opt("\0", "prob", "probability image.");
Optionpk<short> verbose_opt("v", "verbose", "set to: 0 (results only), 1
(confusion matrix), 2 (debug)",0);
- version_opt.retrieveOption(argc,argv);
- license_opt.retrieveOption(argc,argv);
- help_opt.retrieveOption(argc,argv);
- todo_opt.retrieveOption(argc,argv);
-
- input_opt.retrieveOption(argc,argv);
- training_opt.retrieveOption(argc,argv);
- label_opt.retrieveOption(argc,argv);
- reclass_opt.retrieveOption(argc,argv);
- balance_opt.retrieveOption(argc,argv);
- minSize_opt.retrieveOption(argc,argv);
- start_opt.retrieveOption(argc,argv);
- end_opt.retrieveOption(argc,argv);
- band_opt.retrieveOption(argc,argv);
- offset_opt.retrieveOption(argc,argv);
- scale_opt.retrieveOption(argc,argv);
- aggreg_opt.retrieveOption(argc,argv);
- priors_opt.retrieveOption(argc,argv);
- svm_type_opt.retrieveOption(argc,argv);
- kernel_type_opt.retrieveOption(argc,argv);
- kernel_degree_opt.retrieveOption(argc,argv);
- gamma_opt.retrieveOption(argc,argv);
- coef0_opt.retrieveOption(argc,argv);
- ccost_opt.retrieveOption(argc,argv);
- nu_opt.retrieveOption(argc,argv);
- epsilon_loss_opt.retrieveOption(argc,argv);
- cache_opt.retrieveOption(argc,argv);
- epsilon_tol_opt.retrieveOption(argc,argv);
- shrinking_opt.retrieveOption(argc,argv);
- prob_est_opt.retrieveOption(argc,argv);
- cv_opt.retrieveOption(argc,argv);
- comb_opt.retrieveOption(argc,argv);
- bag_opt.retrieveOption(argc,argv);
- bagSize_opt.retrieveOption(argc,argv);
- classBag_opt.retrieveOption(argc,argv);
- mask_opt.retrieveOption(argc,argv);
- maskValue_opt.retrieveOption(argc,argv);
- flag_opt.retrieveOption(argc,argv);
- output_opt.retrieveOption(argc,argv);
- oformat_opt.retrieveOption(argc,argv);
- colorTable_opt.retrieveOption(argc,argv);
- option_opt.retrieveOption(argc,argv);
- prob_opt.retrieveOption(argc,argv);
- verbose_opt.retrieveOption(argc,argv);
-
- if(version_opt[0]||todo_opt[0]){
- std::cout << version_opt.getHelp() << std::endl;
- std::cout << "todo: " << todo_opt.getHelp() << std::endl;
- exit(0);
+ bool doProcess;//stop process when program was invoked with help option (-h
--help)
+ try{
+ doProcess=input_opt.retrieveOption(argc,argv);
+ training_opt.retrieveOption(argc,argv);
+ label_opt.retrieveOption(argc,argv);
+ reclass_opt.retrieveOption(argc,argv);
+ balance_opt.retrieveOption(argc,argv);
+ minSize_opt.retrieveOption(argc,argv);
+ start_opt.retrieveOption(argc,argv);
+ end_opt.retrieveOption(argc,argv);
+ band_opt.retrieveOption(argc,argv);
+ offset_opt.retrieveOption(argc,argv);
+ scale_opt.retrieveOption(argc,argv);
+ aggreg_opt.retrieveOption(argc,argv);
+ priors_opt.retrieveOption(argc,argv);
+ svm_type_opt.retrieveOption(argc,argv);
+ kernel_type_opt.retrieveOption(argc,argv);
+ kernel_degree_opt.retrieveOption(argc,argv);
+ gamma_opt.retrieveOption(argc,argv);
+ coef0_opt.retrieveOption(argc,argv);
+ ccost_opt.retrieveOption(argc,argv);
+ nu_opt.retrieveOption(argc,argv);
+ epsilon_loss_opt.retrieveOption(argc,argv);
+ cache_opt.retrieveOption(argc,argv);
+ epsilon_tol_opt.retrieveOption(argc,argv);
+ shrinking_opt.retrieveOption(argc,argv);
+ prob_est_opt.retrieveOption(argc,argv);
+ cv_opt.retrieveOption(argc,argv);
+ comb_opt.retrieveOption(argc,argv);
+ bag_opt.retrieveOption(argc,argv);
+ bagSize_opt.retrieveOption(argc,argv);
+ classBag_opt.retrieveOption(argc,argv);
+ mask_opt.retrieveOption(argc,argv);
+ maskValue_opt.retrieveOption(argc,argv);
+ flag_opt.retrieveOption(argc,argv);
+ output_opt.retrieveOption(argc,argv);
+ oformat_opt.retrieveOption(argc,argv);
+ colorTable_opt.retrieveOption(argc,argv);
+ option_opt.retrieveOption(argc,argv);
+ prob_opt.retrieveOption(argc,argv);
+ verbose_opt.retrieveOption(argc,argv);
}
- if(license_opt[0]){
- std::cout << Optionpk<bool>::getGPLv3License() << std::endl;
+ catch(string predefinedString){
+ std::cout << predefinedString << std::endl;
exit(0);
}
- if(help_opt[0]){
- std::cout << "usage: pkclassify_svm -i testimage -o outputimage -t
training [OPTIONS]" << std::endl;
- exit(0);
+ if(!doProcess){
+ std::cout << "short option -h shows basic options only, use long option
--help to show all options" << std::endl;
+ exit(0);//help was invoked, stop processing
}
if(verbose_opt[0]>=1){
@@ -300,6 +278,12 @@ int main(int argc, char *argv[])
cerr << error << std::endl;
exit(1);
}
+ catch(std::exception& e){
+ std::cerr << "Error: ";
+ std::cerr << e.what() << std::endl;
+ std::cerr << CPLGetLastErrorMsg() << std::endl;
+ exit(1);
+ }
catch(...){
cerr << "error catched" << std::endl;
exit(1);
diff --git a/src/apps/pkdumpogr.cc b/src/apps/pkdumpogr.cc
index 1f50032..a64c64e 100644
--- a/src/apps/pkdumpogr.cc
+++ b/src/apps/pkdumpogr.cc
@@ -90,7 +90,8 @@ int main(int argc, char *argv[])
if(attribute_opt[0]!="ALL"){
vector<double> xvector;
vector<double> yvector;
- inputReader.readXY(xvector,yvector);
+ if(inputReader.getGeometryType()==wkbPoint)
+ inputReader.readXY(xvector,yvector);
Vector2d<double> theData(attribute_opt.size());
for(int ifield=0;ifield<attribute_opt.size();++ifield){
if(verbose_opt[0])
@@ -103,7 +104,7 @@ int main(int argc, char *argv[])
std::cout << "number of samples: " << theData[0].size() << std::endl;
}
if(transpose_opt[0]){
- if(pos_opt[0]){
+ if(pos_opt[0]&&(inputReader.getGeometryType()==wkbPoint)){
if(output_opt[0]!=""){
outputFile << "X" << " ";
for(int isample=0;isample<xvector.size();++isample){
diff --git a/src/apps/pkextract.cc b/src/apps/pkextract.cc
index 8f63472..c3ac4f9 100644
--- a/src/apps/pkextract.cc
+++ b/src/apps/pkextract.cc
@@ -812,8 +812,8 @@ int main(int argc, char *argv[])
readLayer->ResetReading();
OGRFeature *readFeature;
int isample=0;
- int ifeature=0;
-
+ unsigned long int ifeature=0;
+ unsigned long int nfeature=sampleReader.getFeatureCount();
ImgWriterOgr boxWriter;
if(rbox_opt[0]>0||cbox_opt[0]>0){
if(verbose_opt[0]>1)
@@ -827,6 +827,8 @@ int main(int argc, char *argv[])
// ogrWriter.createField(fieldname,OFTInteger);
boxWriter.createField(fieldname,OFTInteger);
}
+ progress=0;
+ pfnProgress(progress,pszMessage,pProgressArg);
while( (readFeature = readLayer->GetNextFeature()) != NULL ){
if(verbose_opt[0]>0)
std::cout << "reading feature " << readFeature->GetFID() <<
std::endl;
@@ -2186,6 +2188,8 @@ int main(int argc, char *argv[])
throw(oss.str());
}
++ifeature;
+ progress=static_cast<float>(ifeature+1)/nfeature;
+ pfnProgress(progress,pszMessage,pProgressArg);
}
catch(std::string e){
std::cout << e << std::endl;
diff --git a/src/apps/pkinfo.cc b/src/apps/pkinfo.cc
index 64062dc..0219f72 100644
--- a/src/apps/pkinfo.cc
+++ b/src/apps/pkinfo.cc
@@ -35,9 +35,7 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
|short|long|type|default|description|
|-----|----|----|-------|-----------|
- | lic | license | b | false |Shows license information |
- | h | help | b | false |Shows this help info |
- | i | input | Ss | <empty string> |Input image file |
+| i | input | Ss | |Input image file |
| bb | bbox | b | false |Shows bounding box |
| te | te | b | false |Shows bounding box in GDAL
format: xmin ymin xmax ymax |
| c | centre | b | false |Image centre in projected X,Y
coordinates |
@@ -45,39 +43,35 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
| s | samples | b | false |Number of samples in image |
| l | lines | b | false |Number of lines in image |
| nb | nband | b | false |Show number of bands in image
|
- | b | band | s | 0 |Band specific information |
+ | b | band | s | 0 |Band specific information |
| dx | dx | b | false |Gets resolution in x (in m) |
| dy | dy | b | false |Gets resolution in y (in m) |
| mm | minmax | b | false |Shows min and max value of
the image |
| stat | stat | b | false |Shows statistics (min,max,
mean and stdDev of the image) |
- | min | min | d | |Sets minimum for histogram |
- | max | max | d | |Sets maximum for histogram |
+ | min | min | d | |Sets minimum for histogram |
+ | max | max | d | |Sets maximum for histogram |
| rel | rel | b | false |Calculates relative histogram
in percentage |
| p | projection | b | false |Shows projection of the image
|
| geo | geo | b | false |Gets geotransform |
| il | interleave | b | false |Shows interleave |
| f | filename | b | false |Shows image filename |
| cov | cover | b | false |Image covers bounding box (or
x and y pos) if printed to std out |
- | x | xpos | d | |x pos |
- | y | ypos | d | |y pos |
+ | x | xpos | d | |x pos |
+ | y | ypos | d | |y pos |
| r | read | b | false |Reads row y (in projected
coordinates if geo option is set, otherwise in image coordinates, 0 based) |
| ref | ref | b | false |Gets reference pixel (lower
left corner of centre of gravity pixel) |
| of | oformat | b | false |Gets driver description |
- | e | extent | Ss | <empty string> |Gets boundary from
extent from polygons in vector file |
- | ulx | ulx | d | |Upper left x value bounding box |
- | uly | uly | d | |Upper left y value bounding box |
- | lrx | lrx | d | |Lower right x value bounding box |
- | lry | lry | d | |Lower right y value bounding box |
+ | e | extent | Ss | |Gets boundary from extent
from polygons in vector file |
+ | ulx | ulx | d | |Upper left x value bounding
box |
+ | uly | uly | d | |Upper left y value bounding
box |
+ | lrx | lrx | d | |Lower right x value bounding
box |
+ | lry | lry | d | |Lower right y value bounding
box |
| hist | hist | b | false |Calculates histogram. Use
--rel for a relative histogram output. |
- | nbin | nbin | s | 0 |Number of bins used in histogram.
Use 0 for all input values as integers |
+ | nbin | nbin | s | 0 |Number of bins used in
histogram. Use 0 for all input values as integers |
| ot | otype | b | false |Returns data type |
| d | description | b | false |Returns image description |
| meta | meta | b | false |Shows meta data |
- | nodata | nodata | d | |Sets no data value(s) for
calculations (flags in input image) |
- | | version | b | false |version 2.4, Copyright (C)
2008-2012 Pieter Kempeneers.
- This program comes with ABSOLUTELY NO WARRANTY; for details type use option
-h.
- This is free software, and you are welcome to redistribute it
- under certain conditions; use option --license for details. |
+ | nodata | nodata | d | |Sets no data value(s) for
calculations (flags in input image) |
*/
#include <sstream>
#include <list>
@@ -92,115 +86,92 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
int main(int argc, char *argv[])
{
- Optionpk<bool> license_opt("lic","license","Shows license
information",false);
- Optionpk<bool> help_opt("h","help","Shows this help info",false);
- Optionpk<bool> doxygen_opt("\0","doxygen","Shows this help info",false,2);
- Optionpk<bool> todo_opt("todo","todo","Nothing planned",false,2);
Optionpk<std::string> input_opt("i","input","Input image file","");
- Optionpk<bool> bbox_opt("bb", "bbox", "Shows bounding box ", false);
- Optionpk<bool> bbox_te_opt("te", "te", "Shows bounding box in GDAL format:
xmin ymin xmax ymax ", false);
- Optionpk<bool> centre_opt("c", "centre", "Image centre in projected X,Y
coordinates ", false);
- Optionpk<bool> colorTable_opt("ct", "colourtable", "Shows colour table ",
false);
- Optionpk<bool> samples_opt("s", "samples", "Number of samples in image ",
false);
- Optionpk<bool> lines_opt("l", "lines", "Number of lines in image ", false);
- Optionpk<bool> nband_opt("nb", "nband", "Show number of bands in image",
false);
- Optionpk<short> band_opt("b", "band", "Band specific information", 0);
- Optionpk<bool> dx_opt("dx", "dx", "Gets resolution in x (in m)", false);
- Optionpk<bool> dy_opt("dy", "dy", "Gets resolution in y (in m)", false);
- Optionpk<bool> minmax_opt("mm", "minmax", "Shows min and max value of the
image ", false);
- Optionpk<bool> stat_opt("stat", "stat", "Shows statistics (min,max, mean
and stdDev of the image)", false);
+ Optionpk<bool> bbox_opt("bb", "bbox", "Shows bounding box ", false,1);
+ Optionpk<bool> bbox_te_opt("te", "te", "Shows bounding box in GDAL format:
xmin ymin xmax ymax ", false,1);
+ Optionpk<bool> centre_opt("c", "centre", "Image centre in projected X,Y
coordinates ", false,1);
+ Optionpk<bool> colorTable_opt("ct", "colourtable", "Shows colour table ",
false,1);
+ Optionpk<bool> samples_opt("s", "samples", "Number of samples in image ",
false,1);
+ Optionpk<bool> lines_opt("l", "lines", "Number of lines in image ",
false,1);
+ Optionpk<bool> nband_opt("nb", "nband", "Show number of bands in image",
false,1);
+ Optionpk<short> band_opt("b", "band", "Band specific information", 0,1);
+ Optionpk<bool> dx_opt("dx", "dx", "Gets resolution in x (in m)", false,1);
+ Optionpk<bool> dy_opt("dy", "dy", "Gets resolution in y (in m)", false,1);
+ Optionpk<bool> minmax_opt("mm", "minmax", "Shows min and max value of the
image ", false,1);
+ Optionpk<bool> stat_opt("stat", "stat", "Shows statistics (min,max, mean
and stdDev of the image)", false,1);
Optionpk<double> min_opt("min", "min", "Sets minimum for histogram");
Optionpk<double> max_opt("max", "max", "Sets maximum for histogram");
- Optionpk<bool> relative_opt("rel", "rel", "Calculates relative histogram in
percentage", false);
- Optionpk<bool> projection_opt("p", "projection", "Shows projection of the
image ", false);
- Optionpk<bool> geo_opt("geo", "geo", "Gets geotransform ", false);
- Optionpk<bool> interleave_opt("il", "interleave", "Shows interleave ",
false);
- Optionpk<bool> filename_opt("f", "filename", "Shows image filename ",
false);
- Optionpk<bool> cover_opt("cov", "cover", "Image covers bounding box (or x
and y pos) if printed to std out ", false);
+ Optionpk<bool> relative_opt("rel", "rel", "Calculates relative histogram in
percentage", false,1);
+ Optionpk<bool> projection_opt("p", "projection", "Shows projection of the
image ", false,1);
+ Optionpk<bool> geo_opt("geo", "geo", "Gets geotransform ", false,1);
+ Optionpk<bool> interleave_opt("il", "interleave", "Shows interleave ",
false,1);
+ Optionpk<bool> filename_opt("f", "filename", "Shows image filename ",
false,1);
+ Optionpk<bool> cover_opt("cov", "cover", "Image covers bounding box (or x
and y pos) if printed to std out ", false,1);
Optionpk<double> x_opt("x", "xpos", "x pos");
Optionpk<double> y_opt("y", "ypos", "y pos");
- Optionpk<bool> read_opt("r", "read", "Reads row y (in projected coordinates
if geo option is set, otherwise in image coordinates, 0 based)", 0);
- Optionpk<bool> refpixel_opt("ref", "ref", "Gets reference pixel (lower left
corner of centre of gravity pixel)", false);
- Optionpk<bool> driver_opt("of", "oformat", "Gets driver description ",
false);
- Optionpk<std::string> extent_opt("e", "extent", "Gets boundary from extent
from polygons in vector file", "");
+ Optionpk<bool> read_opt("r", "read", "Reads row y (in projected coordinates
if geo option is set, otherwise in image coordinates, 0 based)", 0,1);
+ Optionpk<bool> refpixel_opt("ref", "ref", "Gets reference pixel (lower left
corner of centre of gravity pixel)", false,1);
+ Optionpk<bool> driver_opt("of", "oformat", "Gets driver description ",
false,1);
+ Optionpk<std::string> extent_opt("e", "extent", "Gets boundary from extent
from polygons in vector file");
Optionpk<double> ulx_opt("ulx", "ulx", "Upper left x value bounding box");
Optionpk<double> uly_opt("uly", "uly", "Upper left y value bounding box");
Optionpk<double> lrx_opt("lrx", "lrx", "Lower right x value bounding box");
Optionpk<double> lry_opt("lry", "lry", "Lower right y value bounding box");
- Optionpk<bool> hist_opt("hist", "hist", "Calculates histogram. Use --rel
for a relative histogram output. ", false);
- Optionpk<short> nbin_opt("nbin", "nbin", "Number of bins used in histogram.
Use 0 for all input values as integers", 0);
- Optionpk<bool> type_opt("ot", "otype", "Returns data type", false);
- Optionpk<bool> description_opt("d", "description", "Returns image
description", false);
- Optionpk<bool> metadata_opt("meta", "meta", "Shows meta data ", false);
+ Optionpk<bool> hist_opt("hist", "hist", "Calculates histogram. Use --rel
for a relative histogram output. ", false,1);
+ Optionpk<short> nbin_opt("nbin", "nbin", "Number of bins used in histogram.
Use 0 for all input values as integers", 0,1);
+ Optionpk<bool> type_opt("ot", "otype", "Returns data type", false,1);
+ Optionpk<bool> description_opt("d", "description", "Returns image
description", false,1);
+ Optionpk<bool> metadata_opt("meta", "meta", "Shows meta data ", false,1);
Optionpk<double> nodata_opt("nodata", "nodata", "Sets no data value(s) for
calculations (flags in input image)");
- std::string versionString="version ";
- versionString+=VERSION;
- versionString+=", Copyright (C) 2008-2012 Pieter Kempeneers.\n\
- This program comes with ABSOLUTELY NO WARRANTY; for details type use option
-h.\n\
- This is free software, and you are welcome to redistribute it\n\
- under certain conditions; use option --license for details.";
- Optionpk<bool> version_opt("\0","version",versionString,false);
- license_opt.retrieveOption(argc,argv);
- help_opt.retrieveOption(argc,argv);
- doxygen_opt.retrieveOption(argc,argv);
- todo_opt.retrieveOption(argc,argv);
-
- input_opt.retrieveOption(argc,argv);
- bbox_opt.retrieveOption(argc,argv);
- bbox_te_opt.retrieveOption(argc,argv);
- centre_opt.retrieveOption(argc,argv);
- colorTable_opt.retrieveOption(argc,argv);
- samples_opt.retrieveOption(argc,argv);
- lines_opt.retrieveOption(argc,argv);
- nband_opt.retrieveOption(argc,argv);
- band_opt.retrieveOption(argc,argv);
- dx_opt.retrieveOption(argc,argv);
- dy_opt.retrieveOption(argc,argv);
- minmax_opt.retrieveOption(argc,argv);
- stat_opt.retrieveOption(argc,argv);
- min_opt.retrieveOption(argc,argv);
- max_opt.retrieveOption(argc,argv);
- relative_opt.retrieveOption(argc,argv);
- projection_opt.retrieveOption(argc,argv);
- geo_opt.retrieveOption(argc,argv);
- interleave_opt.retrieveOption(argc,argv);
- filename_opt.retrieveOption(argc,argv);
- cover_opt.retrieveOption(argc,argv);
- x_opt.retrieveOption(argc,argv);
- y_opt.retrieveOption(argc,argv);
- read_opt.retrieveOption(argc,argv);
- refpixel_opt.retrieveOption(argc,argv);
- driver_opt.retrieveOption(argc,argv);
- extent_opt.retrieveOption(argc,argv);
- ulx_opt.retrieveOption(argc,argv);
- uly_opt.retrieveOption(argc,argv);
- lrx_opt.retrieveOption(argc,argv);
- lry_opt.retrieveOption(argc,argv);
- hist_opt.retrieveOption(argc,argv);
- nbin_opt.retrieveOption(argc,argv);
- type_opt.retrieveOption(argc,argv);
- description_opt.retrieveOption(argc,argv);
- metadata_opt.retrieveOption(argc,argv);
- nodata_opt.retrieveOption(argc,argv);
- version_opt.retrieveOption(argc,argv);
-
- if(version_opt[0]){
- std::cout << version_opt.getHelp() << std::endl;
- exit(0);
+ bool doProcess;//stop process when program was invoked with help option (-h
--help)
+ try{
+ doProcess=input_opt.retrieveOption(argc,argv);
+ bbox_opt.retrieveOption(argc,argv);
+ bbox_te_opt.retrieveOption(argc,argv);
+ centre_opt.retrieveOption(argc,argv);
+ colorTable_opt.retrieveOption(argc,argv);
+ samples_opt.retrieveOption(argc,argv);
+ lines_opt.retrieveOption(argc,argv);
+ nband_opt.retrieveOption(argc,argv);
+ band_opt.retrieveOption(argc,argv);
+ dx_opt.retrieveOption(argc,argv);
+ dy_opt.retrieveOption(argc,argv);
+ minmax_opt.retrieveOption(argc,argv);
+ stat_opt.retrieveOption(argc,argv);
+ min_opt.retrieveOption(argc,argv);
+ max_opt.retrieveOption(argc,argv);
+ relative_opt.retrieveOption(argc,argv);
+ projection_opt.retrieveOption(argc,argv);
+ geo_opt.retrieveOption(argc,argv);
+ interleave_opt.retrieveOption(argc,argv);
+ filename_opt.retrieveOption(argc,argv);
+ cover_opt.retrieveOption(argc,argv);
+ x_opt.retrieveOption(argc,argv);
+ y_opt.retrieveOption(argc,argv);
+ read_opt.retrieveOption(argc,argv);
+ refpixel_opt.retrieveOption(argc,argv);
+ driver_opt.retrieveOption(argc,argv);
+ extent_opt.retrieveOption(argc,argv);
+ ulx_opt.retrieveOption(argc,argv);
+ uly_opt.retrieveOption(argc,argv);
+ lrx_opt.retrieveOption(argc,argv);
+ lry_opt.retrieveOption(argc,argv);
+ hist_opt.retrieveOption(argc,argv);
+ nbin_opt.retrieveOption(argc,argv);
+ type_opt.retrieveOption(argc,argv);
+ description_opt.retrieveOption(argc,argv);
+ metadata_opt.retrieveOption(argc,argv);
+ nodata_opt.retrieveOption(argc,argv);
}
- if(license_opt[0]){
- cout << Optionpk<bool>::getGPLv3License() << endl;
+ catch(string predefinedString){
+ std::cout << predefinedString << std::endl;
exit(0);
}
- if(help_opt[0]){
- cout << "usage: pkcrop -i inputimage -o outputimage [OPTIONS]" << endl;
- exit(0);
+ if(!doProcess){
+ std::cout << "short option -h shows basic options only, use long option
--help to show all options" << std::endl;
+ exit(0);//help was invoked, stop processing
}
- if(doxygen_opt[0]){
- exit(0);
- }
-
//for union
double maxLRX=0;
double maxULY=0;
@@ -277,7 +248,7 @@ int main(int argc, char *argv[])
if(cover_opt[0]){
//get bounding box from extentReader if defined
ImgReaderOgr extentReader;
- if(extent_opt[0]!=""){
+ if(extent_opt.size()){
extentReader.open(extent_opt[0]);
if(!(extentReader.getExtent(ulx_opt[0],uly_opt[0],lrx_opt[0],lry_opt[0]))){
cerr << "Error: could not get extent from " << extent_opt[0] <<
std::endl;
diff --git a/src/base/Makefile.in b/src/base/Makefile.in
index ac52146..ab89956 100644
--- a/src/base/Makefile.in
+++ b/src/base/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -89,12 +89,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(libbase_adir)"
HEADERS = $(libbase_a_HEADERS) $(noinst_HEADERS)
ETAGS = etags
@@ -271,7 +265,7 @@ $(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libbase.a: $(libbase_a_OBJECTS) $(libbase_a_DEPENDENCIES)
$(EXTRA_libbase_a_DEPENDENCIES)
+libbase.a: $(libbase_a_OBJECTS) $(libbase_a_DEPENDENCIES)
-rm -f libbase.a
$(libbase_a_AR) libbase.a $(libbase_a_OBJECTS) $(libbase_a_LIBADD)
$(RANLIB) libbase.a
@@ -314,7 +308,9 @@ uninstall-libbase_aHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(libbase_a_HEADERS)'; test -n "$(libbase_adir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libbase_adir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libbase_adir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libbase_adir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -415,15 +411,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/src/base/Optionpk.h b/src/base/Optionpk.h
index c9271c9..8c84b46 100644
--- a/src/base/Optionpk.h
+++ b/src/base/Optionpk.h
@@ -31,6 +31,10 @@ along with pktools. If not, see
<http://www.gnu.org/licenses/>.
#include <typeinfo>
#include "ogr_feature.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
using namespace std;
class BadConversion : public runtime_error {
@@ -40,8 +44,8 @@ class BadConversion : public runtime_error {
{ }
};
-template<typename T> inline T string2type(string const& s,bool
failIfLeftoverChars){
- istringstream i(s);
+template<typename T> inline T string2type(std::string const& s,bool
failIfLeftoverChars){
+ std::istringstream i(s);
char c;
T x;
if (!(i >> x) || (failIfLeftoverChars && i.get(c)))
@@ -49,8 +53,8 @@ template<typename T> inline T string2type(string const&
s,bool failIfLeftoverCha
return x;
}
-template<typename T> inline T string2type(string const& s){
- istringstream i(s);
+template<typename T> inline T string2type(std::string const& s){
+ std::istringstream i(s);
T x;
if (!(i >> x) )
throw BadConversion(s);
@@ -58,12 +62,12 @@ template<typename T> inline T string2type(string const& s){
}
//specialization for string
-template<> inline string string2type(string const& s){
+template<> inline std::string string2type(std::string const& s){
return s;
}
//specialization for OGRFieldType
-template<> inline OGRFieldType string2type(string const& s){
+template<> inline OGRFieldType string2type(std::string const& s){
OGRFieldType ftype;
int ogr_typecount=11;//hard coded for now!
for(int iType = 0; iType < ogr_typecount; ++iType){
@@ -74,14 +78,14 @@ template<> inline OGRFieldType string2type(string const& s){
return ftype;
}
-template<typename T> inline string type2string(T const& value){
- ostringstream oss;
+template<typename T> inline std::string type2string(T const& value){
+ std::ostringstream oss;
oss << value;
return oss.str();
}
//specialization for bool
-template<> inline string type2string(bool const& value){
+template<> inline std::string type2string(bool const& value){
if(value)
return("true");
else
@@ -89,16 +93,16 @@ template<> inline string type2string(bool const& value){
}
//specialization for string
-template<> inline string type2string(string const& value){
- if(value.empty())
- return("<empty string>");
- else
+template<> inline std::string type2string(std::string const& value){
+ // if(value.empty())
+ // return("<empty string>");
+ // else
return(value);
}
//specialization for float
-template<> inline string type2string(float const& value){
- ostringstream oss;
+template<> inline std::string type2string(float const& value){
+ std::ostringstream oss;
// oss.precision(1);
// oss.setf(ios::fixed);
oss << value;
@@ -106,26 +110,26 @@ template<> inline string type2string(float const& value){
}
//specialization for double
-template<> inline string type2string(double const& value){
- ostringstream oss;
+template<> inline std::string type2string(double const& value){
+ std::ostringstream oss;
// oss.precision(1);
// oss.setf(ios::fixed);
oss << value;
return oss.str();
}
-template<class T> class Optionpk : public vector <T>
+template<class T> class Optionpk : public std::vector <T>
{
public:
Optionpk();
- Optionpk(const string& shortName, const string& longName, const string&
helpInfo);
- Optionpk(const string& shortName, const string& longName, const string&
helpInfo,const T& defaultValue, short hide=0);
+ Optionpk(const std::string& shortName, const std::string& longName, const
std::string& helpInfo);
+ Optionpk(const std::string& shortName, const std::string& longName, const
std::string& helpInfo,const T& defaultValue, short hide=0);
~Optionpk();
- void setHelp(const string& helpInfo){m_help=helpInfo;};
- string usage() const;
- string usageDoxygen() const;
- static string getGPLv3License(){
- return static_cast<string>("\n\
+ void setHelp(const std::string& helpInfo){m_help=helpInfo;};
+ std::string usage() const;
+ std::string usageDoxygen() const;
+ static std::string getGPLv3License(){
+ return static_cast<std::string>("\n\
This program is free software: you can redistribute it and/or modify\n\
it under the terms of the GNU General Public License as published by\n\
the Free Software Foundation, either version 3 of the License, or\n\
@@ -138,26 +142,26 @@ public:
\n\
You should have received a copy of the GNU General Public License\n\
along with this program. If not, see
<http://www.gnu.org/licenses/>.\n");};
- string getHelp() const {return m_help;};
+ std::string getHelp() const {return m_help;};
bool retrieveOption(int argc, char ** argv);///make sure to call this
function first before using the option
- std::vector<string>::const_iterator findSubstring(string argument) const;
+ std::vector<std::string>::const_iterator findSubstring(const std::string&
argument) const;
template<class T1> friend ostream& operator<<(ostream & os, const
Optionpk<T1>& theOption);
private:
- void setAll(const string& shortName, const string& longName, const string&
helpInfo);
- void setAll(const string& shortName, const string& longName, const string&
helpInfo,const T& defaultValue, short hide);
+ void setAll(const std::string& shortName, const std::string& longName, const
std::string& helpInfo);
+ void setAll(const std::string& shortName, const std::string& longName, const
std::string& helpInfo,const T& defaultValue, short hide);
void setDefault(const T& defaultValue);
- string getDefaultValue() const {return m_defaultValue;};
- void setShortName(const string& shortName);
- void setLongName(const string& longName);
- string getShortName() const {return m_shortName;};
- string getLongName() const {return m_longName;};
+ std::string getDefaultValue() const {return m_defaultValue;};
+ void setShortName(const std::string& shortName);
+ void setLongName(const std::string& longName);
+ std::string getShortName() const {return m_shortName;};
+ std::string getLongName() const {return m_longName;};
bool hasArgument() const {return m_hasArgument;};//all options except bools
should have arguments
bool hasShortOption() const {return m_shortName.compare("\0");};
bool hasLongOption() const {return m_longName.compare("\0");};
- /*! short option invoked with `-` */string m_shortName;
- /*! long option invoked with `--` */ string m_longName;
- /*! the help message that is shown when option -h or --help is invoked */
string m_help;
+ /*! short option invoked with `-` */std::string m_shortName;
+ /*! long option invoked with `--` */ std::string m_longName;
+ /*! the help message that is shown when option -h or --help is invoked */
std::string m_help;
/*! false for options of type bool */ bool m_hasArgument;
/*! the default value of the option */ T m_defaultValue;
/*! option has a default value */ bool m_hasDefault;
@@ -178,22 +182,22 @@ template<class T> Optionpk<T>::Optionpk()
{
}
-template<class T> Optionpk<T>::Optionpk(const string& shortName, const string&
longName, const string& helpInfo)
+template<class T> Optionpk<T>::Optionpk(const std::string& shortName, const
std::string& longName, const std::string& helpInfo)
: m_hasDefault(false)
{
setAll(shortName,longName,helpInfo);
}
-template<class T> Optionpk<T>::Optionpk(const string& shortName, const string&
longName, const string& helpInfo,const T& defaultValue, short hide)
+template<class T> Optionpk<T>::Optionpk(const std::string& shortName, const
std::string& longName, const std::string& helpInfo,const T& defaultValue, short
hide)
{
setAll(shortName,longName,helpInfo,defaultValue, hide);
}
-template<class T> string Optionpk<T>::usage() const
+template<class T> std::string Optionpk<T>::usage() const
{
- ostringstream helpss;
- string shortOption=m_shortName;
- string longOption=m_longName;
+ std::ostringstream helpss;
+ std::string shortOption=m_shortName;
+ std::string longOption=m_longName;
shortOption.insert(0,"-");
longOption.insert(0,"--");
if(hasShortOption())
@@ -210,11 +214,11 @@ template<class T> string Optionpk<T>::usage() const
return helpss.str();
}
-template<class T> string Optionpk<T>::usageDoxygen() const
+template<class T> std::string Optionpk<T>::usageDoxygen() const
{
- ostringstream helpss;
- string shortOption=m_shortName;
- string longOption=m_longName;
+ std::ostringstream helpss;
+ std::string shortOption=m_shortName;
+ std::string longOption=m_longName;
if(hasShortOption())
helpss << " | " << setiosflags(ios::left) << setw(6) << shortOption << " |
";
@@ -234,7 +238,7 @@ template<class T> string Optionpk<T>::usageDoxygen() const
return helpss.str();
}
-template<class T> void Optionpk<T>::setAll(const string& shortName, const
string& longName, const string& helpInfo,const T& defaultValue, short hide)
+template<class T> void Optionpk<T>::setAll(const std::string& shortName, const
std::string& longName, const std::string& helpInfo,const T& defaultValue, short
hide)
{
m_shortName=shortName;
m_longName=longName;
@@ -245,25 +249,25 @@ template<class T> void Optionpk<T>::setAll(const string&
shortName, const string
m_hide=hide;
}
-template<class T> void Optionpk<T>::setAll(const string& shortName, const
string& longName, const string& helpInfo)
+template<class T> void Optionpk<T>::setAll(const std::string& shortName, const
std::string& longName, const std::string& helpInfo)
{
m_shortName=shortName;
m_longName=longName;
m_hasArgument=true;
m_help=helpInfo;
- m_hide=0;
+ m_hide=1;//option with no default value can be hidden (level 1: only visible
with long help info)
}
-template<> void Optionpk<bool>::setAll(const string& shortName, const string&
longName, const string& helpInfo,const bool& defaultValue, short hide);
+template<> void Optionpk<bool>::setAll(const std::string& shortName, const
std::string& longName, const std::string& helpInfo,const bool& defaultValue,
short hide);
-template<> void Optionpk<bool>::setAll(const string& shortName, const string&
longName, const string& helpInfo);
+template<> void Optionpk<bool>::setAll(const std::string& shortName, const
std::string& longName, const std::string& helpInfo);
-template<> Optionpk<bool>::Optionpk(const string& shortName, const string&
longName, const string& helpInfo,const bool& defaultValue, short hide)
+template<> Optionpk<bool>::Optionpk(const std::string& shortName, const
std::string& longName, const std::string& helpInfo,const bool& defaultValue,
short hide)
{
setAll(shortName,longName,helpInfo,defaultValue, hide);
}
-template<> void Optionpk<bool>::setAll(const string& shortName, const string&
longName, const string& helpInfo,const bool& defaultValue, short hide)
+template<> void Optionpk<bool>::setAll(const std::string& shortName, const
std::string& longName, const std::string& helpInfo,const bool& defaultValue,
short hide)
{
m_shortName=shortName;
m_longName=longName;
@@ -279,35 +283,53 @@ template<class T> Optionpk<T>::~Optionpk()
}
template<class T> bool Optionpk<T>::retrieveOption(int argc, char **argv){
+ bool noHelp=true;///return value, alert main program that hard coded option
(help, version, license, doxygen) was invoked
+ std::string helpStringShort="-h";///short option for help (hard coded)
+ std::string helpStringLong="--help";///long option for help (hard coded)
+ std::string helpStringDoxygen="--doxygen";///option to create table of
options ready to use for doxygen
+ std::string versionString="--version";///option to show current version
+ std::string licenseString="--license";///option to show current version
for(int i = 1; i < argc; ++i ){
- string helpStringShort="-h";
- string helpStringLong="--help";
- string helpStringDoxygen="--doxygen";
- string currentArgument;
- string currentOption=argv[i];
- string shortOption=m_shortName;
- string longOption=m_longName;
+ std::string currentArgument;
+ std::string currentOption=argv[i];
+ std::string shortOption=m_shortName;
+ std::string longOption=m_longName;
shortOption.insert(0,"-");
longOption.insert(0,"--");
size_t foundEqual=currentOption.rfind("=");
- if(foundEqual!=string::npos){
+ if(foundEqual!=std::string::npos){
currentArgument=currentOption.substr(foundEqual+1);
currentOption=currentOption.substr(0,foundEqual);
}
if(!helpStringShort.compare(currentOption)){
if(m_hide<1)
- std::cout << usage() << std::endl;
+ std::cout << usage() << std::endl;
+ noHelp=false;
}
else if(!helpStringLong.compare(currentOption)){
if(m_hide<2)
- std::cout << usage() << std::endl;
+ std::cout << usage() << std::endl;
+ noHelp=false;
}
else if(!helpStringDoxygen.compare(currentOption)){
if(m_hide<2)
- std::cout << usageDoxygen() << std::endl;
+ std::cout << usageDoxygen() << std::endl;
+ noHelp=false;
+ }
+ else if(!versionString.compare(currentOption)){
+ std::string theVersion="version ";
+ theVersion+=VERSION;
+ theVersion+=", Copyright (C) Pieter Kempeneers.\n\
+ This program comes with ABSOLUTELY NO WARRANTY; for details type use option
-h.\n \
+ This is free software, and you are welcome to redistribute it\n \
+ under certain conditions; use option --license for details.";
+ throw(theVersion);//no need to continue registering (break prevents from
multiplication of version info)
+ }
+ else if(!licenseString.compare(currentOption)){
+ throw(getGPLv3License());
}
if(hasShortOption()&&!(shortOption.compare(currentOption))){//for -option
- if(foundEqual!=string::npos)
+ if(foundEqual!=std::string::npos)
this->push_back(string2type<T>(currentArgument));
else if(m_hasArgument && i < argc-1)
this->push_back(string2type<T>(argv[++i]));
@@ -315,7 +337,7 @@ template<class T> bool Optionpk<T>::retrieveOption(int
argc, char **argv){
this->push_back(string2type<T>("1"));
}
else if(hasLongOption()&&!(longOption.compare(currentOption))){//for
--option
- if(foundEqual!=string::npos)
+ if(foundEqual!=std::string::npos)
this->push_back(string2type<T>(currentArgument));
else if(m_hasArgument && i < argc-1)
this->push_back(string2type<T>(argv[++i]));
@@ -325,15 +347,15 @@ template<class T> bool Optionpk<T>::retrieveOption(int
argc, char **argv){
}
if(!(this->size())&&m_hasDefault)//only set default value if no options were
given
this->push_back(m_defaultValue);
- return(true);
+ return(noHelp);
}
-template<class T> std::vector<string>::const_iterator
Optionpk<T>::findSubstring(string argument) const{
- std::vector<string>::const_iterator opit=this->begin();
+template<class T> std::vector<std::string>::const_iterator
Optionpk<T>::findSubstring(const std::string& argument) const{
+ std::vector<std::string>::const_iterator opit=this->begin();
while(opit!=this->end()){
if(opit->find(argument)!=std::string::npos)
break;
- ++opit;
+ ++opit;
}
return opit;
}
diff --git a/src/fileclasses/Makefile.in b/src/fileclasses/Makefile.in
index 08d2a08..52d365d 100644
--- a/src/fileclasses/Makefile.in
+++ b/src/fileclasses/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -92,12 +92,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(libfileClasses_adir)"
HEADERS = $(libfileClasses_a_HEADERS)
ETAGS = etags
@@ -263,7 +257,7 @@ $(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfileClasses.a: $(libfileClasses_a_OBJECTS) $(libfileClasses_a_DEPENDENCIES)
$(EXTRA_libfileClasses_a_DEPENDENCIES)
+libfileClasses.a: $(libfileClasses_a_OBJECTS) $(libfileClasses_a_DEPENDENCIES)
-rm -f libfileClasses.a
$(libfileClasses_a_AR) libfileClasses.a $(libfileClasses_a_OBJECTS)
$(libfileClasses_a_LIBADD)
$(RANLIB) libfileClasses.a
@@ -306,7 +300,9 @@ uninstall-libfileClasses_aHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(libfileClasses_a_HEADERS)'; test -n "$(libfileClasses_adir)"
|| list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libfileClasses_adir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libfileClasses_adir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libfileClasses_adir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -407,15 +403,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
diff --git a/src/imageclasses/ImgReaderOgr.cc b/src/imageclasses/ImgReaderOgr.cc
index bf09509..075f7be 100644
--- a/src/imageclasses/ImgReaderOgr.cc
+++ b/src/imageclasses/ImgReaderOgr.cc
@@ -163,8 +163,7 @@ ostream& operator<<(ostream& theOstream, ImgReaderOgr&
theImageReader){
theOstream << "#";
int iField=0;
- theOstream << "X" << " " << "Y" << " ";
- // theOstream << poFDefn->GetFieldDefn(iField)->GetNameRef() << " ";
+ // theOstream << "X" << " " << "Y" << " ";
for(int iField=0;iField<poFDefn->GetFieldCount();++iField){
OGRFieldDefn *poFieldDefn = poFDefn->GetFieldDefn(iField);
string fieldname=poFieldDefn->GetNameRef();
@@ -180,38 +179,27 @@ ostream& operator<<(ostream& theOstream, ImgReaderOgr&
theImageReader){
while( (poFeature = poLayer->GetNextFeature()) != NULL ){
OGRGeometry *poGeometry;
poGeometry = poFeature->GetGeometryRef();
- // if(verbose){
- // if(!poGeometry)
- // cerr << "no geometry defined" << endl << flush;
- // else if(wkbFlatten(poGeometry->getGeometryType()) != wkbPoint)
- // cerr << "poGeometry type: " <<
wkbFlatten(poGeometry->getGeometryType()) << endl << flush;
- // }
- assert(poGeometry != NULL
- && wkbFlatten(poGeometry->getGeometryType()) == wkbPoint);
- OGRPoint *poPoint = (OGRPoint *) poGeometry;
- double x=poPoint->getX();
- double y=poPoint->getY();
+ assert(poGeometry != NULL);
+ double x,y;
+ if(wkbFlatten(poGeometry->getGeometryType()) == wkbPoint){
+ OGRPoint *poPoint = (OGRPoint *) poGeometry;
+ x=poPoint->getX();
+ y=poPoint->getY();
+ }
vector<string> vfields(poFDefn->GetFieldCount());
string featurename;
vector<string>::iterator fit=vfields.begin();
for(int iField=0;iField<poFDefn->GetFieldCount();++iField){
- // OGRFieldDefn *poFieldDefn = poFDefn->GetFieldDefn(iField);
- // string fieldname=poFieldDefn->GetNameRef();
- // if(fieldname==pointname)
- // featurename=poFeature->GetFieldAsString(iField);
- // else
*(fit++)=poFeature->GetFieldAsString(iField);
}
-// theOstream << ifeature << " " << featurename << " " << x << " " << y;
theOstream.precision(12);
- // theOstream << featurename << " " << x << " " << y;
- theOstream << x << " " << y;
+ if(wkbFlatten(poGeometry->getGeometryType()) == wkbPoint)
+ theOstream << x << " " << y;
for(fit=vfields.begin();fit!=vfields.end();++fit)
theOstream << " " << *fit;
theOstream << endl;
++ifeature;
}
- // theOstream.close();
return(theOstream);
}
diff --git a/src/imageclasses/ImgReaderOgr.h b/src/imageclasses/ImgReaderOgr.h
index 2ead995..36a7d0c 100644
--- a/src/imageclasses/ImgReaderOgr.h
+++ b/src/imageclasses/ImgReaderOgr.h
@@ -117,28 +117,29 @@ template <typename T> int
ImgReaderOgr::readData(map<int,Vector2d<T> >& data, co
}
assert(poGeometry != NULL );
// && wkbFlatten(poGeometry->getGeometryType()) == wkbPoint);
- OGRPoint *poPoint;
if(pos){
- poPoint = (OGRPoint *) poGeometry;
if(wkbFlatten(poGeometry->getGeometryType()) == wkbPoint){
- theFeature.push_back(poPoint->getX());
- theFeature.push_back(poPoint->getY());
+ OGRPoint *poPoint;
+ poPoint = (OGRPoint *) poGeometry;
+ theFeature.push_back(poPoint->getX());
+ theFeature.push_back(poPoint->getY());
}
else if(wkbFlatten(poGeometry->getGeometryType()) == wkbPolygon){
+ OGRPoint thePoint;
OGRPolygon * poPolygon = (OGRPolygon *) poGeometry;
- poPolygon->Centroid(poPoint);
- theFeature.push_back(poPoint->getX());
- theFeature.push_back(poPoint->getY());
+ poPolygon->Centroid(&thePoint);
+ theFeature.push_back(thePoint.getX());
+ theFeature.push_back(thePoint.getY());
}
else{
- string errorstring="Error: Centroid for non polygon geometry not
supported until OGR 1.8.0, change ImgReaderOgr if version >= 1.8.0 is
installed...";
- throw(errorstring);
- // poGeometry->Centroid(poPoint);
- // theFeature.push_back(poPoint->getX());
- // theFeature.push_back(poPoint->getY());
+ //Centroid for non polygon geometry not supported until OGR 1.8.0,
comment out if version < 1.8.0 is installed...";
+ OGRPoint thePoint;
+ poGeometry->Centroid(&thePoint);
+ theFeature.push_back(thePoint.getX());
+ theFeature.push_back(thePoint.getY());
}
}
- OGRFeatureDefn *poFDefn = poLayer->GetLayerDefn();
+ // OGRFeatureDefn *poFDefn = poLayer->GetLayerDefn();
string featurename;
for(int iField=0;iField<poFDefn->GetFieldCount();++iField){
OGRFieldDefn *poFieldDefn = poFDefn->GetFieldDefn(iField);
@@ -220,11 +221,14 @@ template <typename T> int
ImgReaderOgr::readData(map<string,Vector2d<T> >& data,
poLayer = m_datasource->GetLayer(layer);
if(poLayer!=NULL){
OGRFeatureDefn *poFDefn = poLayer->GetLayerDefn();
+ assert(poFDefn!=NULL);
+
if(fields.empty()){
fields.resize(poFDefn->GetFieldCount());
if(verbose)
cout << "resized fields to " << fields.size() << endl;
}
+
//start reading features from the layer
OGRFeature *poFeature;
if(verbose)
@@ -249,25 +253,25 @@ template <typename T> int
ImgReaderOgr::readData(map<string,Vector2d<T> >& data,
}
assert(poGeometry != NULL );
// && wkbFlatten(poGeometry->getGeometryType()) == wkbPoint);
- OGRPoint *poPoint;
if(pos){
- poPoint = (OGRPoint *) poGeometry;
if(wkbFlatten(poGeometry->getGeometryType()) == wkbPoint){
- theFeature.push_back(poPoint->getX());
- theFeature.push_back(poPoint->getY());
- }
- else if(wkbFlatten(poGeometry->getGeometryType()) == wkbPolygon){
- OGRPolygon * poPolygon = (OGRPolygon *) poGeometry;
- poPolygon->Centroid(poPoint);
+ OGRPoint *poPoint;
+ poPoint = (OGRPoint *) poGeometry;
theFeature.push_back(poPoint->getX());
theFeature.push_back(poPoint->getY());
+ }
+ else if(wkbFlatten(poGeometry->getGeometryType()) == wkbPolygon){
+ OGRPoint thePoint;
+ poGeometry->Centroid(&thePoint);
+ theFeature.push_back(thePoint.getX());
+ theFeature.push_back(thePoint.getY());
}
else{
- string errorstring="Error: Centroid for non polygon geometry not
supported until OGR 1.8.0, change ImgReaderOgr if version >= 1.8.0 is
installed...";
- throw(errorstring);
- // poGeometry->Centroid(poPoint);
- // theFeature.push_back(poPoint->getX());
- // theFeature.push_back(poPoint->getY());
+ //Centroid for non polygon geometry not supported until OGR 1.8.0,
comment out if version < 1.8.0 is installed...";
+ OGRPoint thePoint;
+ poGeometry->Centroid(&thePoint);
+ theFeature.push_back(thePoint.getX());
+ theFeature.push_back(thePoint.getY());
}
}
// OGRFeatureDefn *poFDefn = poLayer->GetLayerDefn();//got LayerDefn
already...
@@ -310,10 +314,10 @@ template <typename T> int
ImgReaderOgr::readData(map<string,Vector2d<T> >& data,
break;
}
}
+ assert(poFDefn!=NULL);
}
data[theClass].push_back(theFeature);
++ifeature;
- ++ifeature;
}
if(verbose)
cout << "number of features read: " << ifeature << endl << flush;
@@ -414,12 +418,30 @@ template <typename T> int
ImgReaderOgr::readData(vector<T>& data, const OGRField
else if(wkbFlatten(poGeometry->getGeometryType()) != wkbPoint)
cerr << "poGeometry type: " << wkbFlatten(poGeometry->getGeometryType())
<< endl << flush;
}
- assert(poGeometry != NULL
- && wkbFlatten(poGeometry->getGeometryType()) == wkbPoint);
+ assert(poGeometry != NULL);
+ // && wkbFlatten(poGeometry->getGeometryType()) == wkbPoint);
OGRPoint *poPoint = (OGRPoint *) poGeometry;
if(pos){
- data.push_back(poPoint->getX());
- data.push_back(poPoint->getY());
+ if(wkbFlatten(poGeometry->getGeometryType()) == wkbPoint){
+ OGRPoint *poPoint;
+ poPoint = (OGRPoint *) poGeometry;
+ data.push_back(poPoint->getX());
+ data.push_back(poPoint->getY());
+ }
+ else if(wkbFlatten(poGeometry->getGeometryType()) == wkbPolygon){
+ OGRPoint thePoint;
+ poGeometry->Centroid(&thePoint);
+ data.push_back(thePoint.getX());
+ data.push_back(thePoint.getY());
+ }
+ else{
+ //Centroid for non polygon geometry not supported until OGR 1.8.0,
comment out if version < 1.8.0 is installed...";
+ OGRPoint thePoint;
+ poGeometry->Centroid(&thePoint);
+ data.push_back(thePoint.getX());
+ data.push_back(thePoint.getY());
+ }
+
}
string featurename;
for(int iField=0;iField<poFDefn->GetFieldCount();++iField){
diff --git a/src/imageclasses/ImgWriterOgr.cc b/src/imageclasses/ImgWriterOgr.cc
index 86193fc..48955cf 100644
--- a/src/imageclasses/ImgWriterOgr.cc
+++ b/src/imageclasses/ImgWriterOgr.cc
@@ -54,7 +54,7 @@ ImgWriterOgr::ImgWriterOgr(const string& filename,
ImgReaderOgr& imgReaderOgr, b
copyFields(imgReaderOgr);
if(copyData){
OGRFeature *poFeature;
- while( (poFeature = imgReaderOgr.getLayer()->GetNextFeature()) != NULL ){
+ while(true){// (poFeature = imgReaderOgr.getLayer()->GetNextFeature()) !=
NULL ){
poFeature = imgReaderOgr.getLayer()->GetNextFeature();
if( poFeature == NULL )
break;
diff --git a/src/imageclasses/Makefile.in b/src/imageclasses/Makefile.in
index 2f7593a..89169bc 100644
--- a/src/imageclasses/Makefile.in
+++ b/src/imageclasses/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -91,12 +91,6 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__installdirs = "$(DESTDIR)$(libimageClasses_adir)"
HEADERS = $(libimageClasses_a_HEADERS)
ETAGS = etags
@@ -265,7 +259,7 @@ $(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libimageClasses.a: $(libimageClasses_a_OBJECTS)
$(libimageClasses_a_DEPENDENCIES) $(EXTRA_libimageClasses_a_DEPENDENCIES)
+libimageClasses.a: $(libimageClasses_a_OBJECTS)
$(libimageClasses_a_DEPENDENCIES)
-rm -f libimageClasses.a
$(libimageClasses_a_AR) libimageClasses.a $(libimageClasses_a_OBJECTS)
$(libimageClasses_a_LIBADD)
$(RANLIB) libimageClasses.a
@@ -311,7 +305,9 @@ uninstall-libimageClasses_aHEADERS:
@$(NORMAL_UNINSTALL)
@list='$(libimageClasses_a_HEADERS)'; test -n "$(libimageClasses_adir)"
|| list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(libimageClasses_adir)'; $(am__uninstall_files_from_dir)
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(libimageClasses_adir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(libimageClasses_adir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -412,15 +408,10 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s
\
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
