[med-svn] [libvistaio] 01/04: Imported Upstream version 1.2.15
Gert Wollny
gert-guest at alioth.debian.org
Fri Oct 18 10:23:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository libvistaio.
commit 2de99537db6351659b9dfde2a5ea687ed49182c5
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Fri Oct 18 12:16:43 2013 +0200
Imported Upstream version 1.2.15
---
CMakeLists.txt | 8 ++++----
ChangeLog | 10 ++++++++++
doc/VistaIOCombineBands.3 | 2 +-
doc/VistaIOError.3 | 2 +-
doc/VistaIOIdentifyFiles.3 | 10 +++++-----
doc/VistaIOImage.3 | 4 ++--
doc/VistaIOReadFile.3 | 2 +-
doc/VistaIOReadImages.3 | 2 +-
doc/VistaIOWarning.3 | 2 +-
doc/VistaIOoption.3 | 10 +++++-----
10 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8af2927..d62c464 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
#
# Copyright 1993, 1994 University of British Columbia
-# Copyright (c) Leipzig, Madrid 2004 - 2012
+# Copyright (c) Leipzig, Madrid 2004 - 2014
# Max-Planck-Institute for Human Cognitive and Brain Science
# Max-Planck-Institute for Evolutionary Anthropology
# BIT, ETSI Telecomunicacion, UPM
@@ -25,9 +25,9 @@ SET(VENDOR "Gert Wollny")
SET(PACKAGE_NAME "vistaio")
SET(MAJOR_VERSION 1)
SET(MINOR_VERSION 2)
-SET(MICRO_VERSION 14)
-SET(INTERFACE_AGE 0)
-SET(BINARY_AGE 0)
+SET(MICRO_VERSION 15)
+SET(INTERFACE_AGE 1)
+SET(BINARY_AGE 1)
INCLUDE(GNUInstallDirs)
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..33b85c9
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,10 @@
+2.1.15
+
+ * correct errors in the man pages
+
+2.1.14
+
+ * support multiarch in build system
+ * clean up manpages
+ * rename al functions and macros from V* to VistaIO* in order to avoid
+ conflicts with libvia from the Lipsia software package.
diff --git a/doc/VistaIOCombineBands.3 b/doc/VistaIOCombineBands.3
index 9d5ed74..7e70e64 100644
--- a/doc/VistaIOCombineBands.3
+++ b/doc/VistaIOCombineBands.3
@@ -56,7 +56,7 @@ that all bands of the corresponding source image are to be copied, or
it may be a particular band number, indicating that only that band
of the corresponding source image is to be copied.
.PP
-\fBVistaIOCombineBandsVa\fP is similiar except that the source images and band numbers
+\fBVistaIOCombineBandsVa\fP is similar except that the source images and band numbers
are specified by a variable-length argument list. The argument list contains
one or more pairs of the form \fIsrc_image1\fP, \fIsrc_band1\fP, and it is terminated
by the value
diff --git a/doc/VistaIOError.3 b/doc/VistaIOError.3
index bd6ff5d..ecefef8 100644
--- a/doc/VistaIOError.3
+++ b/doc/VistaIOError.3
@@ -79,7 +79,7 @@ to the value of \fBerrno\fP is incorporated into the error message produced by
.RS
.nf
.ft B
-if (ioctl (fd, request, arg) == -1)
+if (ioctl (fd, request, arg) == \-1)
VistaIOSystemError ("MyRoutine: ioctl failed");
.fi
.RE
diff --git a/doc/VistaIOIdentifyFiles.3 b/doc/VistaIOIdentifyFiles.3
index 8244482..2699689 100644
--- a/doc/VistaIOIdentifyFiles.3
+++ b/doc/VistaIOIdentifyFiles.3
@@ -34,7 +34,7 @@ a vector of the arguments that were not recognized as valid filenames.
.IP \fIfd\fP
May specify an open file descriptor that should be checked to ensure it
corresponds to a file or pipe if no filenames are explicitly given by
-command line arguments. Or it may be -1 to indicate that no such
+command line arguments. Or it may be \-1 to indicate that no such
checking should be done.
.SH DESCRIPTION
By convention, a Vista program that reads one or more files can be told
@@ -42,7 +42,7 @@ of those files in any of three ways:
.RS 2n
.IP (a) 4n
the filenames can be supplied as arguments to a command line option (e.g.,
-\fBvxview\ -in\fP\ \fIfile1\ file2\fP\ ...);
+\fBvxview\ \-in\fP\ \fIfile1\ file2\fP\ ...);
.IP (b)
the filenames can be supplied as command line arguments not associated
with any particular option (e.g., \fBvxview\fP\ \fIfile1\ file2\fP\ ...);
@@ -59,7 +59,7 @@ for command line arguments not associated with any option. If those are
also absent, it tries to read its file from the standard input stream.
.PP
Similarly, an output file may be specified using a command line
-option (e.g., \fBvconvolve\ -out\fP \fIfile1\fP), or, by omitting the
+option (e.g., \fBvconvolve\ \-out\fP \fIfile1\fP), or, by omitting the
option and directing the program's standard output stream
(e.g., \fBvconvolve\ >\fP\ \fIfile1\fP).
.PP
@@ -98,7 +98,7 @@ ensure that a file is allowed to default to one of these streams only if
the stream has been associated with a file or pipe, and not a terminal. In
that case, pass as \fIfd\fP the file descriptor that will serve as the
default source or destination of the file, and \fBVistaIOIdentifyFiles\fP will
-check that it is indeed associated with a file or pipe. Otherwise, pass -1
+check that it is indeed associated with a file or pipe. Otherwise, pass \-1
for \fIfd\fP and it will not perform this check.
.SH "RETURN VALUES"
\fBVistaIOIdentifyFiles\fP returns
@@ -162,7 +162,7 @@ Usage: VistaIOReportUsage (argv[0], VistaIONumber (options), options,
/* Identify output file: */
if (! VistaIOIdentifyFiles (VistaIONumber (options), options, "out",
- & argc, argv, -1))
+ & argc, argv, \-1))
goto Usage;
/* Open and process each input file: */
diff --git a/doc/VistaIOImage.3 b/doc/VistaIOImage.3
index a6a5028..6eab53b 100644
--- a/doc/VistaIOImage.3
+++ b/doc/VistaIOImage.3
@@ -110,7 +110,7 @@ may have. For example, if \fIimage\fP has \fBVistaIOSByte\fP pixels, it returns
.IP
\fBVistaIOPixelMinValue\fP returns the minimum value that a pixel of \fIimage\fP
may have. For example, if \fIimage\fP has \fBVistaIOSByte\fP pixels, it returns
--128.0.
+\-128.0.
.PP
.B size_t VistaIOImageSize (VistaIOImage \fIimage\fP)
.IP
@@ -426,7 +426,7 @@ issue a warning message describing the problem.
.PP
The third argument to most image processing routines, \fIband\fP, may
specify a particular band of the source image to be processed; or it may be
-the constant \fBVistaIOAllBands\fP (defined as -1) to indicate that all bands of
+the constant \fBVistaIOAllBands\fP (defined as \-1) to indicate that all bands of
the source image are to be processed. When a particular band is specified,
\fIband\fP must be at least 0 and less than the number of bands in the
source image; the destination image will usually have a single band to
diff --git a/doc/VistaIOReadFile.3 b/doc/VistaIOReadFile.3
index ec3c71b..6ee34c6 100644
--- a/doc/VistaIOReadFile.3
+++ b/doc/VistaIOReadFile.3
@@ -68,7 +68,7 @@ not to a \fBVistaIOImage\fP). If no filter function is supplied (i.e.,
.SB NULL\c
), \fBVistaIOReadFile\fP will read all binary data associated with all objects.
.PP
-For backwards compatability \fBVistaIOReadFile\fP will recognize and read the
+For backwards compatibility \fBVistaIOReadFile\fP will recognize and read the
contents of a UBC image file format (IFF) file. If the first character read
from the stream is ``I'', \fBVistaIOReadFile\fP uses \fBVistaIOReadUbcIff\fP to read a
single UBC IFF image. The image is returned as a \fBVistaIOImage\fP attribute
diff --git a/doc/VistaIOReadImages.3 b/doc/VistaIOReadImages.3
index f7c6f56..7c07165 100644
--- a/doc/VistaIOReadImages.3
+++ b/doc/VistaIOReadImages.3
@@ -29,7 +29,7 @@ Returns a vector of pointers to images read.
top-level images found, and returns the images separately from the file's
other contents.
.PP
-For backwards compatability \fBVistaIOReadImages\fP will also recognize and read
+For backwards compatibility \fBVistaIOReadImages\fP will also recognize and read
an image in the UBC image file format (IFF). If the first character read from
the stream is ``I'', \fBVistaIOReadImages\fP uses \fBVistaIOReadUbcIff\fP to read and
return a single UBC IFF image.
diff --git a/doc/VistaIOWarning.3 b/doc/VistaIOWarning.3
index e68e72e..896285e 100644
--- a/doc/VistaIOWarning.3
+++ b/doc/VistaIOWarning.3
@@ -77,7 +77,7 @@ In this second example, the diagnostic phrase corresponding to the value of
.RS
.nf
.ft B
-if (ioctl (fd, request, arg) == -1)
+if (ioctl (fd, request, arg) == \-1)
VistaIOSystemWarning ("MyRoutine: ioctl failed");
.fi
.RE
diff --git a/doc/VistaIOoption.3 b/doc/VistaIOoption.3
index 2f291b3..ef238ce 100644
--- a/doc/VistaIOoption.3
+++ b/doc/VistaIOoption.3
@@ -198,15 +198,15 @@ static VistaIOOptionDescRec options[] = {
This program may be invoked with any of the following commands:
.RS
.PP
-\fBprogram -color red\fP
+\fBprogram \-color red\fP
.PP
-\fBprogram -in file1 file2 -color red\fP
+\fBprogram \-in file1 file2 \-color red\fP
.PP
-\fBprogram -in - -out file3 -color blue -scale 0.5 0.5\fP
+\fBprogram \-in \- \-out file3 \-color blue \-scale 0.5 0.5\fP
.PP
-\fBprogram -color green -iff\fP
+\fBprogram \-color green \-iff\fP
.PP
-\fBprogram -iff false -color red\fP
+\fBprogram \-iff false \-color red\fP
.RE
.SH "SEE ALSO"
.nh
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libvistaio.git
More information about the debian-med-commit
mailing list