[limereg] 05/37: Imported Upstream version 1.3.2
Mattia Rizzolo
mattia at debian.org
Wed May 3 16:38:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository limereg.
commit 1a10ffcd35c7938fc2b34d5b22d5e05fa757fdfb
Author: Roelof Berg <rberg at berg-solutions.de>
Date: Fri May 1 01:39:13 2015 +0200
Imported Upstream version 1.3.2
---
NEWS | 14 ++++++++++++--
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/doxygen-doc/man/man3/liblimereg.3 | 4 ++--
doc/doxygen-doc/man/man3/limereg.h.3 | 12 +++---------
exe/CRegistrationController.cpp | 11 ++---------
lib/export/limereg.h | 10 ++--------
7 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/NEWS b/NEWS
index 631a085..83e8bbe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,19 @@
+^L
+Version 1.3.2
+
+* Fixed GUI bug, display transformed template image instead of template image twice.
+
+^L
+Version 1.3.1
+
+* Combined lib and exe in one and the same autotools project (use version of the executable)
+
Version 0.9.3
-* Moved to autotools
+* Moved lib to autotools
Version 0.9.2
-* Initial publication on Launchpad
+* Initial publication of lib on Launchpad
diff --git a/configure b/configure
index b49753f..705c208 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.69 for limereg 1.3.1.
+# Generated by GNU Autoconf 2.69 for limereg 1.3.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='limereg'
PACKAGE_TARNAME='limereg'
-PACKAGE_VERSION='1.3.1'
-PACKAGE_STRING='limereg 1.3.1'
+PACKAGE_VERSION='1.3.2'
+PACKAGE_STRING='limereg 1.3.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1408,7 +1408,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures limereg 1.3.1 to adapt to many kinds of systems.
+\`configure' configures limereg 1.3.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1478,7 +1478,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of limereg 1.3.1:";;
+ short | recursive ) echo "Configuration of limereg 1.3.2:";;
esac
cat <<\_ACEOF
@@ -1612,7 +1612,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-limereg configure 1.3.1
+limereg configure 1.3.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2391,7 +2391,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by limereg $as_me 1.3.1, which was
+It was created by limereg $as_me 1.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3256,7 +3256,7 @@ fi
# Define the identity of the package.
PACKAGE='limereg'
- VERSION='1.3.1'
+ VERSION='1.3.2'
cat >>confdefs.h <<_ACEOF
@@ -19705,7 +19705,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by limereg $as_me 1.3.1, which was
+This file was extended by limereg $as_me 1.3.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19771,7 +19771,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-limereg config.status 1.3.1
+limereg config.status 1.3.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 59a9bb3..9c55c7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.68)
-AC_INIT([limereg],[1.3.1])
+AC_INIT([limereg],[1.3.2])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_SUBST([ac_aux_dir])
diff --git a/doc/doxygen-doc/man/man3/liblimereg.3 b/doc/doxygen-doc/man/man3/liblimereg.3
index 4350db5..06680b4 100644
--- a/doc/doxygen-doc/man/man3/liblimereg.3
+++ b/doc/doxygen-doc/man/man3/liblimereg.3
@@ -1,11 +1,11 @@
-.TH "liblimereg" 3 "Wed Mar 25 2015" "liblimereg-1.3.1" \" -*- nroff -*-
+.TH "liblimereg" 3 "Fri May 1 2015" "liblimereg-1.3.2" \" -*- nroff -*-
.ad l
.nh
.SH NAME
liblimereg \- Library for lightweight image registration\&.
Software development library, that performs a 2D, rigid image registration on two greyscale images and outputs either the transformation parameters or the registered image\&.
.PP
-Sourcecode: https://github.com/RoelofBerg/liblimereg
+Sourcecode: http://embedded-software-architecture.com/limereg.html
.SH "Usage Information"
.PP
Link with -mlimereg and #include <\fBlimereg\&.h\fP>\&. API documentation see: man \fBlimereg\&.h\fP
diff --git a/doc/doxygen-doc/man/man3/limereg.h.3 b/doc/doxygen-doc/man/man3/limereg.h.3
index 44f0d54..918ebf0 100644
--- a/doc/doxygen-doc/man/man3/limereg.h.3
+++ b/doc/doxygen-doc/man/man3/limereg.h.3
@@ -1,4 +1,4 @@
-.TH "limereg.h" 3 "Wed Mar 25 2015" "liblimereg-1.3.1" \" -*- nroff -*-
+.TH "limereg.h" 3 "Fri May 1 2015" "liblimereg-1.3.2" \" -*- nroff -*-
.ad l
.nh
.SH NAME
@@ -75,12 +75,6 @@ Software development library, that performs a 2D, rigid image registration on tw
.nf
Examples:
-https://github.com/RoelofBerg/liblimereg: This is the sourcecode of this library, look in the test folder.
-
-https://github.com/RoelofBerg/limereg: Commandline utility using this library.
-
-Examples:
-
In the source distribution at http://embedded-software-architecture.com/limereg.html the following folders contain examples:
tests: C written test automation that can be used as example code.
@@ -94,7 +88,7 @@ Copyright 2014, Roelof Berg, Licensed under the 3-clause BSD license at http://b
.PP
.nf
Sourcecode:
-https://github.com/RoelofBerg/liblimereg
+http://embedded-software-architecture.com/limereg.html
.fi
.PP
@@ -273,4 +267,4 @@ return code
.SH "Author"
.PP
-Generated automatically by Doxygen for liblimereg-1\&.3\&.1 from the source code\&.
+Generated automatically by Doxygen for liblimereg-1\&.3\&.2 from the source code\&.
diff --git a/exe/CRegistrationController.cpp b/exe/CRegistrationController.cpp
index 87b1490..a8bfcc9 100644
--- a/exe/CRegistrationController.cpp
+++ b/exe/CRegistrationController.cpp
@@ -192,19 +192,12 @@ void CRegistrationController::RegisterImage()
{
bNeedTransImage = (!m_bNoGui) || (0<m_sSaveTransImage.size());
+ Limereg_Image tmpTrnsPixels;
if(bNeedTransImage)
{
// calculate transformed template image
imgTmpTrns=cvCloneImage(imgTmp);
- Limereg_Image tmpPixels;
- tmpPixels.pixelBuffer = (t_pixel *)imgTmp->imageData;
- tmpPixels.imageWidth = (uint32_t)iDim;
- tmpPixels.imageHeight = (uint32_t)iDim;
- refPixels.pixelType = Limereg_Image::Limereg_Grayscale_8;
- refPixels.pyramidImage = Limereg_Image::Limereg_NotPyramidized;
-
- Limereg_Image tmpTrnsPixels;
tmpTrnsPixels.pixelBuffer = (t_pixel *)imgTmpTrns->imageData;
tmpTrnsPixels.imageWidth = (uint32_t)iDim;
tmpTrnsPixels.imageHeight = (uint32_t)iDim;
@@ -256,7 +249,7 @@ void CRegistrationController::RegisterImage()
refPixels.pyramidImage = Limereg_Image::Limereg_NotPyramidized;
//todo: examine retval
- Limereg_CalculateDiffImage(&refPixels, &tmpPixels, &imgDiffFinalPixels);
+ Limereg_CalculateDiffImage(&refPixels, &tmpTrnsPixels, &imgDiffFinalPixels);
// show images
//Intelligent image display size (size of image but not more than a maximum)
diff --git a/lib/export/limereg.h b/lib/export/limereg.h
index 0fd868c..2e4098a 100644
--- a/lib/export/limereg.h
+++ b/lib/export/limereg.h
@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Software development library, that performs a 2D, rigid image registration on two greyscale images and outputs either the transformation parameters or the registered image.
Sourcecode:
- https://github.com/RoelofBerg/liblimereg
+ http://embedded-software-architecture.com/limereg.html
@section usage Usage Information
Link with -mlimereg and #include <limereg.h>. API documentation see: man limereg.h
@@ -69,12 +69,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Examples:
- https://github.com/RoelofBerg/liblimereg: This is the sourcecode of this library, look in the test folder.
-
- https://github.com/RoelofBerg/limereg: Commandline utility using this library.
-
- Examples:
-
In the source distribution at http://embedded-software-architecture.com/limereg.html the following folders contain examples:
tests: C written test automation that can be used as example code.
@@ -84,7 +78,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copyright 2014, Roelof Berg, Licensed under the 3-clause BSD license at http://berg-solutions.de/limereg-license.html. Credit goes to Lars Koenig and Jan Ruehaak from Fraunhofer MEVIS in Germany.
Sourcecode:
- https://github.com/RoelofBerg/liblimereg
+ http://embedded-software-architecture.com/limereg.html
*/
#ifdef __cplusplus
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/limereg.git
More information about the debian-science-commits
mailing list