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 f914d1f2d795e848339572b9850dd4ec7a7cc998
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Thu Apr 17 18:42:12 2014 +0200
configure.ac: gdal>=1.10.0
---
ChangeLog | 1 +
Doxyfile | 2 +-
configure.ac | 2 +-
doc/examples_pkcomposite.dox | 12 ++++++------
doc/faq_pkcomposite.dox | 8 ++++----
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49ee4c7..276d69b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -264,6 +264,7 @@ version 2.5.1
- pksieve
retain nodata in pksieve when mask is set
version 2.5.2
+ - configure script: GDAL>=1.10.0 is required for pkdiff
- programs ported to windows and GUI with Qt
removed underscore for QProcess in Windows
- pkclassify_svm -> pksvm
diff --git a/Doxyfile b/Doxyfile
index 86e25b9..36aac61 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NUMBER =
# for a project that appears at the top of each page and should give viewer
# a quick idea about the purpose of the project. Keep the description short.
-PROJECT_BRIEF = "open source toolkit for geospatial data"
+PROJECT_BRIEF = "Processing Kernel for geospatial data"
# With the PROJECT_LOGO tag one can specify an logo or icon that is
# included in the documentation. The maximum height of the logo should not
diff --git a/configure.ac b/configure.ac
index 2c95185..30ec14a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ LT_INIT
# check if the source folder is correct
AC_CONFIG_SRCDIR([src/apps/pkinfo.cc])
-AX_LIB_GDAL([1.8.0]) dnl uncomment if gdal version 1.8.0 is required
+AX_LIB_GDAL([1.10.0]) dnl uncomment if gdal version 1.10.0 is required
AC_CHECK_HEADERS([gdal.h])
diff --git a/doc/examples_pkcomposite.dox b/doc/examples_pkcomposite.dox
index cc77223..55a0ceb 100644
--- a/doc/examples_pkcomposite.dox
+++ b/doc/examples_pkcomposite.dox
@@ -1,26 +1,26 @@
-\section examples_pkcomposit Examples of pkcomposit
+\section examples_pkcomposite Examples of pkcomposite
\code
-pkcomposit -i input1.tif -i input2.tif -o output.tif
+pkcomposite -i input1.tif -i input2.tif -o output.tif
\endcode
create composit from two input images. If images overlap, keep only last image
(default rule)
\code
-pkcomposit -i input1.tif -i input2.tif -srcnodata 255 -bndnodata 1 -dstnodata
0 -o output.tif
+pkcomposite -i input1.tif -i input2.tif -srcnodata 255 -bndnodata 1 -dstnodata
0 -o output.tif
\endcode
create composit from two input images. Values of 255 in band 1 (starting from
0) are masked as invalid. Typically used when second band of input image is a
cloud mask
\code
-pkcomposit -i input1.tif -i input2.tif -cr maxndvi -rb 0 -rb 1 -srcnodata 255
-bndnodata 0 -dstnodata 0 -o output.tif
+pkcomposite -i input1.tif -i input2.tif -cr maxndvi -rb 0 -rb 1 -srcnodata 255
-bndnodata 0 -dstnodata 0 -o output.tif
\endcode
create maximum NDVI (normalized difference vegetation index) composit. Values
of 255 in band 0 are masked as invalid and flagged as 0 if no other valid
coverage. Typically used for (e.g., MODIS) images where red and near infrared
spectral bands are stored in bands 0 and 1 respectively. In this particular
case, a value of 255 in the first input band indicates a nodata value (e.g.,
cloud mask is coded within the data values).
\code
-pkcomposit -i input1.tif -i input2.tif -i input3.tif -o output.tif -cr mean -w
0.75 -w 1.5 -w 0.75
+pkcomposite -i input1.tif -i input2.tif -i input3.tif -o output.tif -cr mean
-w 0.75 -w 1.5 -w 0.75
\endcode
create composite image using weighted mean:
output=(3/4*input1+6/4*input2+3/4*input2)/3.0
\code
-pkcomposit -i large.tif $(for IMAGE in *.tif;do pkinfo -i $IMAGE --cover
$(pkinfo -i coverage.tif -bb);done) -cr median -min 0 -o output.tif
+pkcomposite -i large.tif $(for IMAGE in *.tif;do pkinfo -i $IMAGE --cover
$(pkinfo -i coverage.tif -bb);done) -cr median -min 0 -o output.tif
\endcode
create median composit of all GTiff images found in current directory that
cover (at least part of) the image coverage.tif. Values smaller or equal to 0
are set as nodata 0 (default value for -dstnodata)
diff --git a/doc/faq_pkcomposite.dox b/doc/faq_pkcomposite.dox
index 7996b71..070b18f 100644
--- a/doc/faq_pkcomposite.dox
+++ b/doc/faq_pkcomposite.dox
@@ -1,4 +1,4 @@
-\section faq_pkmosaic Frequently asked questions about pkmosaic
+\section faq_pkcomposite Frequently asked questions about pkcomposite
Q1. First questiona
A1. For individual invalid value(s) in input image, use -t (–invalid)
@@ -8,12 +8,12 @@
Example:
\code
-pkmosaic -i input1.tif -i input2.tif -o output.tif -t 0 -t 255 -vb 0 -vb 1
+pkcomposite -i input1.tif -i input2.tif -o output.tif -t 0 -t 255 -vb 0 -vb 1
\endcode
will consider 0 in band 0 and 255 in band 1 of input images as no value
\code
-pkmosaic -i input1.tif -i input2.tif -o output.tif -t 0 -vb 0 -vb 1
+pkcomposite -i input1.tif -i input2.tif -o output.tif -t 0 -vb 0 -vb 1
\endcode
will consider 0 in both bands 0 and 1 of input images as no value
@@ -21,7 +21,7 @@ For range(s) of invalid values in input images: use -min
(–min) and -max (–m
Example:
\code
-pkmosaic -i input1.tif -i input2.tif -o output.tif -min 0 -max 200 -min 0 -max
2 -vb 0 -vb 1
+pkcomposite -i input1.tif -i input2.tif -o output.tif -min 0 -max 200 -min 0
-max 2 -vb 0 -vb 1
\endcode
will consider all negative values in band 0 and 1 of input images as invalid.
Values larger or equal to 200 in band 0 will be invalid, as well as values
larger or equal to 2 in band 1
--
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
