debian/0000755000000000000000000000000012302121242007153 5ustar debian/bin/0000755000000000000000000000000012270704616007743 5ustar debian/bin/uscan_repack.sh0000755000000000000000000000144412270704616012743 0ustar #! /bin/sh # # This script is called as: # $0 --upstream-version echo set -ex test $# -eq 3 || exit 255 version="$2" filename="$3" toplevel_sourcedir=`tar ztf ${filename} | head -n 1 | sed -e 's,/.*,,g'` tar zxf ${filename} rm -f ${filename} mv $toplevel_sourcedir $toplevel_sourcedir+dfsg rm -rf $toplevel_sourcedir+dfsg/src/win32helpers find $toplevel_sourcedir+dfsg -name '*.vcproj' -o -name '*.sln' | xargs rm -f for patch in debian/patches-repack/*.patch; do ( cd $toplevel_sourcedir+dfsg; patch -p1 ) < $patch done ( cd $toplevel_sourcedir+dfsg aclocal -I m4 autoheader -f automake -acf autoconf rm -rf autom4te.cache/ config.h.in~ ) tar cf - $toplevel_sourcedir+dfsg | gzip -9 \ > ../enblend-enfuse_$version+dfsg.orig.tar.gz rm -rf $toplevel_sourcedir+dfsg debian/sed-fix-texi-ids0000644000000000000000000000065112270704616012203 0ustar #!/bin/sh set -e # texinfo 5.1 breaks on [^[:alnum:]] variable names (@set). grep -hE '@set ' doc/var*texi |\ sed -e 's/.*@set \([^ ]*\) .*/\1/' |\ sort -u |\ while read i ; do j=`echo $i | sed \ -e 's/:/COLON/g' -e 's/-/DASH/g' -e 's/[^[:alnum:]]/X/'` echo "s/@set $i /@set $j /" echo "s/@value{$i}/@value{$j}/g" done > debian/sedscript # apply to doc/*texi # sed -i -f debian/sedscript doc/*texi debian/enblend.install0000644000000000000000000000021112270704616012164 0ustar ../../doc/enblend.pdf usr/share/doc/enblend usr/bin/enblend usr/bin/enblend-mp usr/share/info/enblend.info usr/share/man/man1/enblend.1 debian/copyright0000644000000000000000000002067512270704616011140 0ustar This package was debianized by Sebastian Harl on Sun, 28 Oct 2007 18:25:17 +0100. It was downloaded from . Upstream Authors: Pablo d'Angelo Mikołaj Leszczyński Max Lyons Andrew Mihal Christoph Spiel Brent Townshend Kornel Benko (CMake maintanance) For further credits, see AUTHORS. Copyright Holders (in alphabetical order): Andrew Mihal Braden McDaniel Dr. Christoph L. Spiel Dean Povey Dustin J. Mitchell Erik de Castro Lopo Francesco Salvestrini Free Software Foundation, Inc. Helmut Dersch Mikołaj Leszczyński Pablo d'Angelo Steven G. Johnson CMake: Kornel Benko / Ryan Sleevi Harry van der Wolf License: Files mdate-sh doc/texinfo.tex Copyright © 1985-2009 Free Software Foundation, Inc. Files include/vigra_ext/cachedfileimage.hxx include/vigra_ext/stdcachedfileimage.hxx Copyright (C) 2004 Andrew Mihal (the VIGRA license - identical to the MIT X11 license) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files include/vigra_ext/fillpolygon.hxx include/vigra_ext/impexalpha.hx Copyright (C) 2012 Dr. Christoph L. Spiel GPLv2+ File include/vigra_ext/functoraccessor.hxx (C) Pablo d'Angelo GPLv2+ Files src/graphcut.h src/masktypedefs.h src/postoptimizer.h Copyright (C) 2011-2012 Mikolaj Leszczynski GPLv2+ File src/maskcommon.h Copyright (C) 2004-2012 Andrew Mihal, Mikolaj Leszczynski GPLv2+ Files src/DefaultSig.pm src/Sig.pm src/error_message.{cc,h} src/filenameparse.{cc,h} src/filespec.{cc,h} src/gen_sig src/global.h src/layer_selection/* src/mga.h src/minimizer.h src/nearest.h src/openmp.h src/self_test.{cc,h} src/tiff_message.{cc,h} Copyright © 2008-2012 Dr. Christoph L. Spiel All other files (except doc/*.{info,texi}, m4/*) Copyright © 2004-2012 Andrew Mihal This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License, version 2, can be found in `/usr/share/common-licenses/GPL-2'. The complete text of the latest version of the GPL can be found in `/usr/share/common- licenses/GPL'. File texinfo.tex Copyright © 1985-2009 Free Software Foundation, Inc. This texinfo.tex file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This texinfo.tex file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . As a special exception, when this file is read by TeX when processing a Texinfo source document, you may use the result without restriction. (This has been our intent since Texinfo was invented.) Files doc/enblend.info doc/enblend.texi doc/enfuse.info doc/enfuse.texi Copyright © 2004-2012 Andrew Mihal Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. On Debian systems, the complete text of the GNU Free Documentation License 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2'. Files m4/ax_check_gl.m4 m4/ax_check_glu.m4 m4/ax_check_glut.m4 Copyright © 2009 Braden McDaniel Files m4/ax_openmp.m4 m4/ax_pthread.m4 Copyright © 2008 Steven G. Johnson This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . As a special exception, the respective Autoconf Macro's copyright owner gives unlimited permission to copy, distribute and modify the configure scripts that are the output of Autoconf when processing the Macro. You need not follow the terms of the GNU General Public License when using or distributing such scripts, even though portions of the text of the Macro appear in them. The GNU General Public License (GPL) does govern all other use of the material that constitutes the Autoconf Macro. This special exception to the GPL applies to versions of the Autoconf Macro released by the Autoconf Archive. When you make and distribute a modified version of the Autoconf Macro, you may extend this special exception to the GPL to apply to your modified version as well. File m4/ax_lang_compiler_ms.m4 Copyright © 2009 Braden McDaniel File m4/ax_prog_perl_modules.m4 Copyright © 2009 Dean Povey File m4/ax_with_prog.m4 Copyright © 2008 Francesco Salvestrini Copyright © 2008 Dustin J. Mitchell Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. Files m4/lrint.m4 m4/lrintf.m4 src/float_cast.h Copyright © Erik de Castro Lopo Permission to use, copy, modify, distribute, and sell this file for any purpose is hereby granted without fee, provided that the above copyright and this permission notice appear in all copies. No representations are made about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. The Debian packaging is © 2007-2010 Sebastian Harl , © 2008-2012 Andreas Metzler and is licensed under the GPL, version 2 or later, see above. debian/enblend.links0000644000000000000000000000010312270704616011636 0ustar usr/share/man/man1/enblend.1.gz usr/share/man/man1/enblend-mp.1.gz debian/enfuse.doc-base0000644000000000000000000000050312270704616012055 0ustar Document: enfuse Title: Enfuse Manual Author: Andrew Mihal Abstract: This is the manual for Enfuse, a program to merge different exposures of the same scene to produce an image that looks much like a tonemapped image. Section: Graphics Format: PDF Files: /usr/share/doc/enfuse/enfuse.pdf debian/changelog0000644000000000000000000003001212302121242011021 0ustar enblend-enfuse (4.1.2+dfsg-2ubuntu2) trusty; urgency=medium * Rebuild for libvigraimpex soname bump. -- Matthias Klose Sat, 22 Feb 2014 14:13:09 +0100 enblend-enfuse (4.1.2+dfsg-2ubuntu1) trusty; urgency=medium * Merge from Debian, remaining changes: - Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev | libglew-dev. - Build using -O1 on arm -- Jackson Doak Wed, 22 Jan 2014 06:23:44 +1100 enblend-enfuse (4.1.2+dfsg-2) unstable; urgency=low * Build-Depend on libtiff-dev instead of transitional libtiff4-dev package. * Upload to unstable (lcms2 transition). -- Andreas Metzler Sun, 29 Dec 2013 13:51:09 +0100 enblend-enfuse (4.1.2+dfsg-1) experimental; urgency=low * Use up to date config.sub/config.guess from autotools-dev. (Yes, the files in 4.1.1 should be new enough anyway, but we can fix this once and for all.) Closes: #727373 * Switch b-d to libtiff4-dev as used by vigra-impex. * New upstream version 4.1.2. * 0001-Change-all-texinfo-variable-names-to-alpha-nums.patch 0002-expand-homepage-macro.patch 0003-Texinfo-5.1-workaround-disable-some-macros.patch 0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0007-Leave-TEXINPUTS-alone.patch 0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0009-Texinfo-5.1-workaround-equationW.patch debian/sed-fix-texi-ids Fix build with texinfo 5.1. * Point vcs-* to anonscm.debian.org. -- Andreas Metzler Sun, 27 Oct 2013 09:27:54 +0100 enblend-enfuse (4.1.1+dfsg-1) experimental; urgency=low * New upstream version 4.1.1. -- Andreas Metzler Sat, 06 Apr 2013 09:11:35 +0200 enblend-enfuse (4.1+dfsg-1) experimental; urgency=low * New upstream version 4.1. + unfuzz patches-repack/* + Drop unnecessary patches (10_ftbfs-gold.diff, 11_ftbfs_boost1.46.1.diff) + Build depends on liblcms2-dev instead of liblcms1-dev. (LP: #885324) + Requires external libvigraimpex with OpenEXR support. Closes: #542258 Since the libvigraimpex is built against libtiff5-dev, enblend also switches from 4 to 5. + Build-Depends on libgsl0-dev. + convert (imagemagick) and xmllint (libxml2-utils) are now required for building the documentation. * Build with -Wl,--as-needed and default buildflags, using dpkg-buildflags --export=configure from dpkg-dev >= 1.16.1. * Use debhelper v9. -- Andreas Metzler Sun, 13 Jan 2013 17:51:20 +0100 enblend-enfuse (4.0+dfsg-6ubuntu3) trusty; urgency=medium * No change rebuild against glew 1.10. -- Dimitri John Ledkov Thu, 02 Jan 2014 13:21:09 +0000 enblend-enfuse (4.0+dfsg-6ubuntu2) trusty; urgency=low * No change rebuild for Boost 1.54 transition. -- Dmitrijs Ledkovs Tue, 22 Oct 2013 09:49:20 +0100 enblend-enfuse (4.0+dfsg-6ubuntu1) saucy; urgency=low * Merge from Debian, remaining changes: - Build-depend on libtiff-dev rather than libtiff4-dev. - Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev | libglew-dev. - Use default inlining parameters for the build. - Build using -O1 on armel. -- Dmitrijs Ledkovs Wed, 21 Aug 2013 20:52:52 +0100 enblend-enfuse (4.0+dfsg-6) unstable; urgency=medium * 23_perl5.18.diff from upstream HG. - Fix perl 5.18 build failure. Closes: #719867 -- Andreas Metzler Sun, 18 Aug 2013 18:06:11 +0200 enblend-enfuse (4.0+dfsg-5) unstable; urgency=medium * Texinfo 5.1 fixes/workarounds: + Use only alphanumerical characters in variable names. 15_texi_ids.diff, 16_hardcodeurl.diff, sed-fix-texi-ids + @include file defining VERSION variable before refering to it. 17_fixinclude.diff. + Disable some macros and make sure that macros using conditionals are only invoked on a separate line, even if it adds unwanted whitespace. 18_disablemacros.diff 19_classictimes.diff 20_semilog.diff 21_inline_foo.diff + 22_fixpdfbuild.diff: Stop messing with TEXINPUTS in Makefile*. Closes: #708800 -- Andreas Metzler Sun, 26 May 2013 09:48:16 +0200 enblend-enfuse (4.0+dfsg-4ubuntu4) saucy; urgency=low * No change rebuild for Boost 1.53 transition. -- Dmitrijs Ledkovs Fri, 26 Apr 2013 19:18:40 +0100 enblend-enfuse (4.0+dfsg-4ubuntu3) quantal; urgency=low * Build-depend on libtiff-dev rather than libtiff4-dev. * Build-depend on libglew-dev rather than libglew1.5-dev | libglew1.4-dev | libglew-dev. -- Colin Watson Sun, 09 Sep 2012 20:48:27 +0100 enblend-enfuse (4.0+dfsg-4ubuntu2) quantal; urgency=low * No change rebuild for boost 1.49 transition. -- Dmitrijs Ledkovs Thu, 31 May 2012 21:30:44 +0100 enblend-enfuse (4.0+dfsg-4ubuntu1) precise; urgency=low * Merge from Debian unstable. Remaining changes: - Use default inlining parameters for the build. - Build using -O1 on armel. -- Felix Geyer Tue, 22 Nov 2011 10:35:16 +0100 enblend-enfuse (4.0+dfsg-4) unstable; urgency=low * Build-Depend on libjpeg-dev instead of libjpeg62-dev. Closes: #633757 * [lintian] rename build-stamp to build-arch-stamp. Add build-arch and build-indep targets, the latter is an empty one. -- Andreas Metzler Sat, 16 Jul 2011 15:32:05 +0200 enblend-enfuse (4.0+dfsg-3ubuntu1) oneiric; urgency=low * Merge from Debian unstable. Remaining changes: - Use default inlining parameters for the build. - Build using -O1 on armel. -- Fabrice Coutadeur Sun, 05 Jun 2011 19:29:21 +0200 enblend-enfuse (4.0+dfsg-3) unstable; urgency=low * [11_ftbfs_boost1.46.1.diff]: Pulled from upstream HG, compatibility with BOOST_FILESYSTEM_VERSION 2 and 3. Closes: #625061 -- Andreas Metzler Sat, 14 May 2011 17:51:01 +0200 enblend-enfuse (4.0+dfsg-2ubuntu1) natty; urgency=low * Merge from Debian unstable (LP: #749098). Remaining changes: - Use default inlining parameters for the build. - Build using -O1 on armel. -- Fabrice Coutadeur Sun, 03 Apr 2011 12:36:37 +0000 enblend-enfuse (4.0+dfsg-2) unstable; urgency=medium * [10_ftbfs-gold.diff] Fix FTBFS with --no-copy-dt-needed-entries. Closes: #615708 * Refer to versioned GFDL copy in debian/copyright. -- Andreas Metzler Sat, 02 Apr 2011 15:48:26 +0200 enblend-enfuse (4.0+dfsg-1ubuntu1) maverick; urgency=low * Use default inlining parameters for the build. * Build using -O1 on armel. -- Matthias Klose Tue, 05 Oct 2010 18:57:10 +0200 enblend-enfuse (4.0+dfsg-1) unstable; urgency=low [ Andreas Metzler ] * New upstream version. * Update debian/patches-repack/*. * debian/patches: - Drop unneeded patch addinfosection.dpatch - included upstream. * debian/rules: - Don't try to install TODO - no longer shipped upstream. * debian/enfuse.install: - focus-stacking.info is not installed as a separate file anymore. * debian/control: - Update build-depends by adding gnuplot transfig tidy ttf-freefont, required to build the PDF documentation. * Build/ship alternative binaries of enblend and enfuse binaries with OpenMP support. They are installed as enblend-mp and enfuse-mp respectively. [ Sebastian Harl ] * debian/rules: - Install NEWS and AUTHORS to all packages. - Explicitly en/disable requested features when running configure. - Let enblend/enfuse use the Boost filesystem library -- I suppose, this is more stable and, possibly, better optimized than the shipped fallback implementation. - Replace the whatis entry in the enblend/enfuse manpages with something meaningful (using sed). - Do not compress PDF files. - Clean en{blend,fuse}.tpt files created when building the PDF documentation. * debian/control: - Build-depend on libboost-filesystem-dev. - Updated Standards-Version to 3.9.1 -- no changes. - Build-depend on help2man, required to build the manpages. - Build-depend on perl, ghostscript, texlive and texlive-generic-recommended, required to build the PDF documentation. * debian/rules, debian/enblend.install, debian/enfuse.install: - Build and install PDF documentation. * Added debian/enblend.doc-base, debian/enfuse.doc-base. - … pointing to enblend.pdf and enfuse.pdf respectively. -- Sebastian Harl Mon, 02 Aug 2010 20:39:09 +0000 enblend-enfuse (3.2+dfsg-3) unstable; urgency=medium * Remove usr/share/info/dir, which GNU install-info generates. Closes: #545974 * Add myself to uploaders. * Use ${misc:Depends} to get the required dependency on dpkg or install-info. * Update addinfosection.dpatch to also add info directory entries. -- Andreas Metzler Thu, 10 Sep 2009 19:18:59 +0200 enblend-enfuse (3.2+dfsg-2) unstable; urgency=low * Upload to unstable - Lenny has been released. * debian/control: - Updated standards-version to 3.8.1 - no changes. -- Sebastian Harl Mon, 06 Apr 2009 17:29:29 +0200 enblend-enfuse (3.2+dfsg-1) experimental; urgency=low * New upstream release (Closes: #491370). [ Andreas Metzler ] * Uploading to experimental because of the Lenny freeze. * debian/control: - Added zlib1g-dev, libjpeg62-dev, libpng12-dev to the build dependencies, although they currently would be pulled in by other build-depends. - Added libopenexr-dev and pkg-config to the build dependencies. - Updated package description to mention enfuse and the buzz-word "exposure blending". - Added texinfo to build-depends. * debian/patches: - Added addinfosection.dpatch - add @dircategory to the texinfo sources to get an entry in the main info directory. * debian/rules: - Run dh_installinfo. [ Sebastian Harl ] * Thanks a lot to Andreas for his help! * debian/rules: - Include AUTHORS file in the package as well. - Added get-orig-source target which uses uscan to download and repack the upstream tarball using debian/bin/uscan_repack.sh - thanks to Bernd Zeimetz for the idea! - Remove rebuilt documentation files. - Use dh_install. * debian/patches: - Removed gcc4.3-includes.dpatch - included upstream. - Removed type_mismatch.dpatch - included upstream. * debian/patches-repack: - Added patches to be applied when repacking the tarball. - Added 00-win32helpers.patch to remove src/win32helpers/, *.sln and *.vcproj from the build scripts. - Added 01-unnecessary-libs.patch to remove unnecessary libs from the linker flags - based on a patch by Andreas. * debian/control: - Updated standards-version to 3.8.0 - no changes. - Renamed the source package to "enblend-enfuse" - just like upstream did. - Added new binary package "enfuse". * debian/bin/uscan_repack.sh: - Added script to take care of the repacking. - Remove src/win32helpers/. - Remove *.sln and *.vcproj. - Apply patches in debian/patches-repack/. - Regenerate autotools build system. * debian/watch: - Call debian/bin/uscan_repack.sh. -- Sebastian Harl Sun, 12 Oct 2008 20:33:27 +0200 enblend (3.0+dfsg-2) unstable; urgency=low * Added libglew1.5-dev to the build dependencies to ease the libglew1.4 -> libglew1.5 transition and make sbuild happy (Closes: #465620). -- Sebastian Harl Wed, 13 Feb 2008 22:03:26 +0100 enblend (3.0+dfsg-1) unstable; urgency=low * Initial release (Closes: #294389, #390655). * Removed GPL incompatible src/win32helpers/ from .orig.tar.gz. * Added type_mismatch.dpatch to fix a failure to instantiate std::max(). * Added gcc4.3-includes.dpatch to add missing includes required by gcc-4.3. -- Sebastian Harl Fri, 28 Dec 2007 02:46:07 +0100 debian/enfuse.links0000644000000000000000000000010112270704616011512 0ustar usr/share/man/man1/enfuse.1.gz usr/share/man/man1/enfuse-mp.1.gz debian/patches-repack/0000755000000000000000000000000012270704616012065 5ustar debian/patches-repack/00-win32helpers.patch0000644000000000000000000000152612270704616015654 0ustar diff -NurBbp a/configure.in enblend-enfuse-4.1/configure.in --- a/configure.in 2012-12-08 09:23:59.000000000 +0100 +++ enblend-enfuse-4.1/configure.in 2013-01-13 13:56:18.802614326 +0100 @@ -556,7 +556,6 @@ AC_CONFIG_FILES([Makefile include/vigra_ext/Makefile src/Makefile src/layer_selection/Makefile - src/win32helpers/Makefile doc/Makefile]) AC_OUTPUT diff -NurBbp a/src/Makefile.am enblend-enfuse-4.1/src/Makefile.am --- a/src/Makefile.am 2012-12-08 09:23:59.000000000 +0100 +++ enblend-enfuse-4.1/src/Makefile.am 2013-01-13 13:57:44.218612113 +0100 @@ -3,7 +3,7 @@ AM_CFLAGS = $(EXTRACFLAGS) AM_CXXFLAGS = $(EXTRACXXFLAGS) AM_LDFLAGS = $(EXTRALDFLAGS) -SUBDIRS = layer_selection win32helpers +SUBDIRS = layer_selection bin_PROGRAMS = enblend enfuse debian/patches-repack/01-unnecessary-libs.patch0000644000000000000000000000107512270704616016615 0ustar diff -NurbBp a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4 --- a/m4/ax_check_glut.m4 2009-09-06 15:14:31.000000000 +0200 +++ b/m4/ax_check_glut.m4 2009-12-20 14:23:34.000000000 +0100 @@ -72,12 +72,6 @@ m4_define([AX_CHECK_GLUT_PROGRAM], # endif]], [[glutMainLoop()]])]) -# -# If X is present, assume GLUT depends on it. -# -AS_IF([test X$no_x != Xyes], - [GLUT_LIBS="${X_PRE_LIBS} -lXmu -lXi ${X_EXTRA_LIBS} ${GLUT_LIBS}"]) - AC_CACHE_CHECK([for GLUT library], [ax_cv_check_glut_libglut], [ax_cv_check_glut_libglut="no" AC_LANG_PUSH(C) debian/enfuse.install0000644000000000000000000000020312270704616012043 0ustar ../../doc/enfuse.pdf usr/share/doc/enfuse usr/bin/enfuse usr/bin/enfuse-mp usr/share/info/enfuse.info usr/share/man/man1/enfuse.1 debian/enblend.doc-base0000644000000000000000000000051512270704616012202 0ustar Document: enblend Title: Enblend Manual Author: Andrew Mihal Abstract: This manual is for Enblend, a tool for compositing images in such a way that the seam between the images is invisible, or at least very difficult to see. Section: Graphics Format: PDF Files: /usr/share/doc/enblend/enblend.pdf debian/compat0000644000000000000000000000000212270704616010371 0ustar 9 debian/patches/0000755000000000000000000000000012270704616010622 5ustar debian/patches/0007-Leave-TEXINPUTS-alone.patch0000644000000000000000000000215112270704616015757 0ustar From e3f81b899eb1a1b8918e8794774747d4355839bc Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:21:34 +0100 Subject: [PATCH 7/9] Leave TEXINPUTS alone Do not export TEXINPUTS in Makefile(.am). Automake seems to have this in hand anyway and it breaks building the pdf-documentation with texinfo 5.1. Watch texinfo failing on TEXINPUTS="." texi2dvi --pdf --batch mini.texi and succeding without TEXINPUTS or with TEXINPUTS=".:". Where mini.texi looks like this: |------------- |\input thumbpdf.sty |\input texinfo |Hello World |@bye |------------- Bug: https://bugs.launchpad.net/bugs/1181678 --- doc/Makefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index 75567b9..f46a105 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -895,8 +895,6 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ uninstall-am uninstall-dvi-am uninstall-html-am \ uninstall-info-am uninstall-pdf-am uninstall-ps-am -export TEXINPUTS=$(top_builddir):$(srcdir) - # Phony Targets .PHONY: install-html -- 1.7.10.4 debian/patches/0009-Texinfo-5.1-workaround-equationW.patch0000644000000000000000000000525112270704616020314 0ustar From 63484fd3e22307e8416676393a7fec83db202db3 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:45:23 +0100 Subject: [PATCH 9/9] Texinfo 5.1 workaround - @equationW Texinfo breaks if macros using a conditional are placed in the middle of a line. (This is documented in Texinfo 5.1 reference but used to work.) Change texinfo source, although it adds unwanted whitespace in output. --- doc/enfuse.texi | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/doc/enfuse.texi b/doc/enfuse.texi index 63aa1ca..8ecf313 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -2477,7 +2477,8 @@ to the final @math{Q(x, y)}: @math{w(P(1, x, y)) * P(1, x, y) + ... + w(P(n, x, y)) * P(n, x, y) ---> Q(x, y),}@w{ }@equationW{} +--> Q(x, y),}@w{ }@c +@equationW{} @end display @end ifinfo @html @@ -2545,7 +2546,9 @@ w(P(n, x, y)) * P(n, x, y) , - @equationW{} + @c +@equationW{} + @end html @@ -2553,7 +2556,9 @@ w(P(n, x, y)) * P(n, x, y) $$ w(P(1, x, y)) P(1, x, y) + \ldots + w(P(n, x, y)) P(n, x, y) \rightarrow - Q(x, y),\hskip4em\hbox{@equationW{}} + Q(x, y),\hskip4em\hbox{@c +@equationW{} +} $$ @end tex @docbook @@ -2971,7 +2976,9 @@ contributes as much as its weight demands. Of course the weights can be extreme, favoring only a few pixels or even only one pixel in the input stack. Extremes are not typical, however. -Equal weights are another extreme that turns @equationW{} into an +Equal weights are another extreme that turns +@equationW{} +into an arithmetic average. This is why we sometimes speak of the ``averaging property'' of this weighting algorithm, like smoothing out noise. @@ -2992,7 +2999,8 @@ Trouper'') weighting mode, where the pixel with the highest weight wins, this is, gets weight@tie{}one, and all other pixels get the weight of zero (@uref{http://@/en.wikipedia.org/@/wiki/@/The_@/Winner_@/Takes_@/It_@/All,,``The -Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@equationW{} +Winner Takes It All.''}). With @option{--hard-mask} Equation@tie{}@c +@equationW{} becomes @ifinfo @display @@ -3137,7 +3145,9 @@ where @noindent Note that this ``averaging'' scheme lacks the nice noise-reduction -property of the weighted average@tie{}@equationW{}, because only a +property of the weighted average@tie{}@c +@equationW{} +, because only a single input pixel contributes to the output. -- 1.7.10.4 debian/patches/0002-expand-homepage-macro.patch0000644000000000000000000000214212270704616016362 0ustar From 30727827485eeab1bc0eaa90371aa9ddb34b07f8 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:02:40 +0100 Subject: [PATCH 2/9] expand homepage-macro texinfo 5.1 breaks on variable names (@set / @value) containing non-alphanumerical characters. - Only a single one of the macros is inherited from ./configure. Lets just hardcode it instead. --- doc/bug-reports.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi index 716146a..250fc20 100644 --- a/doc/bug-reports.texi +++ b/doc/bug-reports.texi @@ -16,7 +16,7 @@ reliable and enjoyable. When you encounter a problem, the first thing to do is to see if it is already known. To this end visit the package's @uref{https://@/launchpad.net/, LaunchPad} bug -@uref{@value{CFG::PACKAGE_BUGREPORT}, database}. Search it for your +@uref{https://bugs.launchpad.net/enblend, database}. Search it for your particular problem. If it is not known, please report it. In order for a bug report to serve its purpose, you must include the -- 1.7.10.4 debian/patches/0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch0000644000000000000000000000606612270704616023021 0ustar From a4acc187401ed14af07f86978c549cf684afd3e2 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:15:29 +0100 Subject: [PATCH 5/9] Texinfo 5.1 workaround - macro on a separate line Texinfo breaks if macros using a conditional are placed in the middle of a line. (This is documented in Texinfo 5.1 reference but used to work.) Change texinfo source, although it adds unwanted whitespace in output. --- doc/enblend.texi | 27 ++++++++++++++++++--------- doc/enfuse.texi | 27 ++++++++++++++++++--------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/doc/enblend.texi b/doc/enblend.texi index 49e5120..e1baee0 100644 --- a/doc/enblend.texi +++ b/doc/enblend.texi @@ -1196,11 +1196,14 @@ For floating-point format, use @itemize @item -Minimum normalized value: @semilog{1.2, -38} +Minimum normalized value: +@semilog{1.2, -38} @item -Epsilon: @semilog{1.2, -7} +Epsilon: +@semilog{1.2, -7} @item -Maximum finite value: @semilog{3.4, 38} +Maximum finite value: +@semilog{3.4, 38} @end itemize @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 @@ -1212,11 +1215,14 @@ Maximum finite value: @semilog{3.4, 38} @itemize @item -Minimum normalized value: @semilog{2.2, -308} +Minimum normalized value: +@semilog{2.2, -308} @item -Epsilon: @semilog{2.2, -16} +Epsilon: +@semilog{2.2, -16} @item -Maximum finite value: @semilog{1.8, 308} +Maximum finite value: +@semilog{1.8, 308} @end itemize @end table @@ -1238,11 +1244,14 @@ floating-point numbers. @itemize @item -Minimum normalized value: @semilog{9.3, -10} +Minimum normalized value: +@semilog{9.3, -10} @item -Epsilon: @semilog{2.0, -3} +Epsilon: +@semilog{2.0, -3} @item -Maximum finite value: @semilog{4.3, 9} +Maximum finite value: +@semilog{4.3, 9} @end itemize @item -f @var{WIDTH}x@var{HEIGHT} diff --git a/doc/enfuse.texi b/doc/enfuse.texi index 483bc4f..27e8b33 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -1257,11 +1257,14 @@ For floating-point format, use @itemize @item -Minimum normalized value: @semilog{1.2, -38} +Minimum normalized value: +@semilog{1.2, -38} @item -Epsilon: @semilog{1.2, -7} +Epsilon: +@semilog{1.2, -7} @item -Maximum finite value: @semilog{3.4, 38} +Maximum finite value: +@semilog{3.4, 38} @end itemize @c IEEE double: 64 bits, n = 53, k = 64 - n - 1 = 10 @@ -1273,11 +1276,14 @@ Maximum finite value: @semilog{3.4, 38} @itemize @item -Minimum normalized value: @semilog{2.2, -308} +Minimum normalized value: +@semilog{2.2, -308} @item -Epsilon: @semilog{2.2, -16} +Epsilon: +@semilog{2.2, -16} @item -Maximum finite value: @semilog{1.8, 308} +Maximum finite value: +@semilog{1.8, 308} @end itemize @end table @@ -1299,11 +1305,14 @@ floating-point numbers. @itemize @item -Minimum normalized value: @semilog{9.3, -10} +Minimum normalized value: +@semilog{9.3, -10} @item -Epsilon: @semilog{2.0, -3} +Epsilon: +@semilog{2.0, -3} @item -Maximum finite value: @semilog{4.3, 9} +Maximum finite value: +@semilog{4.3, 9} @end itemize @item -f @var{WIDTH}x@var{HEIGHT} -- 1.7.10.4 debian/patches/0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch0000644000000000000000000000343012270704616023014 0ustar From 7da7340e373b18f1a6a412a8c0427e1a11010bdd Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:39:48 +0100 Subject: [PATCH 8/9] Texinfo 5.1 workaround - macro on a separate line Texinfo breaks if macros using a conditional are placed in the middle of a line. (This is documented in Texinfo 5.1 reference but used to work.) Change texinfo source, although it adds unwanted whitespace in output. --- doc/enblend.texi | 4 +++- doc/enfuse.texi | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/enblend.texi b/doc/enblend.texi index e1baee0..abf088e 100644 --- a/doc/enblend.texi +++ b/doc/enblend.texi @@ -508,7 +508,9 @@ As a guideline, remember that each new level works on a linear scale twice as large as the previous one. So, the zeroth layer, the original image, obviously defines the image at single-pixel scale, the first level works at two-pixel scale, and generally, the @math{n}-th -level contains image data at @power{2, n}-pixel scale. This is the +level contains image data at +@power{2, n} +-pixel scale. This is the reason why an image of @math{width}@c @classictimes{}@c diff --git a/doc/enfuse.texi b/doc/enfuse.texi index 3d230b5..63aa1ca 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -621,7 +621,9 @@ As a guideline, remember that each new level works on a linear scale twice as large as the previous one. So, the zeroth layer, the original image, obviously defines the image at single-pixel scale, the first level works at two-pixel scale, and generally, the @math{n}-th -level contains image data at @power{2, n}-pixel scale. This is the +level contains image data at +@power{2, n} +-pixel scale. This is the reason why an image of @math{width}@c @classictimes{}@c -- 1.7.10.4 debian/patches/0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch0000644000000000000000000000361112270704616023013 0ustar From 6686fad3501e6aef8245e434155e271ed225a2ab Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:19:45 +0100 Subject: [PATCH 6/9] Texinfo 5.1 workaround - macro on a separate line Texinfo breaks if macros using a conditional are placed in the middle of a line. (This is documented in Texinfo 5.1 reference but used to work.) Change texinfo source, although it adds unwanted whitespace in output. --- doc/enfuse.texi | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/enfuse.texi b/doc/enfuse.texi index 27e8b33..3d230b5 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -3583,7 +3583,9 @@ $$ @noindent It associates a probability@tie{}@math{p} with each of the @math{n} -different possible outcomes@tie{}@inlineomega{} of the random +different possible outcomes@tie{}@c +@inlineomega{} + of the random variable@tie{}@math{X}. @cindex expectation value Based on @math{w}, we define the @dfn{expectation value} or ``First @@ -4210,7 +4212,9 @@ $$ @end docbook @noindent -The parameter@tie{}@inlinesigma{}, the argument of +The parameter@tie{}@c +@inlinesigma{} +, the argument of option@tie{}@option{--contrast-edge-scale}, is the length scale on which edges are detected by @math{g(x, y)}. We apply the Laplacian operator in Cartesian coordinates @@ -4422,7 +4426,9 @@ $$ @end docbook -where we have used the dimensionless distance@tie{}@inlinexi{} from +where we have used the dimensionless distance@tie{}@c +@inlinexi{} + from the origin @ifinfo @display @@ -4577,7 +4583,9 @@ $R = \sqrt{x^2 + y^2}$. @float Figure,Figure:laplacian-of-gaussian @vimage{laplacian-of-gaussian} -@caption{Laplacian-of-Gaussian function for @inlinesigma{} = 0.5.} +@caption{Laplacian-of-Gaussian function for @c +@inlinesigma{} + = 0.5.} @shortcaption{Laplacian-of-Gaussian} @end float -- 1.7.10.4 debian/patches/0001-Change-all-texinfo-variable-names-to-alpha-nums.patch0000644000000000000000000012246412270704616023206 0ustar From 1f79a0a86eabe03f7b7092d759cf984a91da3926 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 07:56:20 +0100 Subject: [PATCH 1/9] Change all texinfo variable-names to alpha-nums texinfo 5.1 breaks on variable names (@set / @value) containing non-alphanumerical characters. Fix this. See debian/sed-fix-texi-ids for info on how to refresh this patch. Author: Andreas Metzler Origin: vendor --- doc/enblend.texi | 92 ++++++++++++++++++++--------------------- doc/enfuse.texi | 112 +++++++++++++++++++++++++------------------------- doc/varsenblend.texi | 88 +++++++++++++++++++-------------------- doc/varsenfuse.texi | 108 ++++++++++++++++++++++++------------------------ 4 files changed, 200 insertions(+), 200 deletions(-) diff --git a/doc/enblend.texi b/doc/enblend.texi index 17b7c3d..f825797 100644 --- a/doc/enblend.texi +++ b/doc/enblend.texi @@ -448,7 +448,7 @@ However, @uref{http://@/hci.iwr.uni-@/heidelberg.de/@/vigra/, @cindex layer selection @cindex layer selection Override the standard layer selector algorithm, which is -@samp{@value{src::layer-selector}}. +@samp{@value{srcCOLONCOLONlayerDASHselector}}. This version of Enblend offers the following algorithms: @table @code @@ -588,8 +588,8 @@ pyramids. Use @samp{auto} or @samp{automatic} as @var{LEVELS} to restore the automatic calculation of the maximum number of levels. The valid range of the absolute value of @var{LEVELS} is -@value{src::minimum-pyramid-levels} to -@value{src::maximum-pyramid-levels}. +@value{srcCOLONCOLONminimumDASHpyramidDASHlevels} to +@value{srcCOLONCOLONmaximumDASHpyramidDASHlevels}. @item -o @itemx --output=@var{FILE} @@ -597,11 +597,11 @@ The valid range of the absolute value of @var{LEVELS} is @opindex --output Place output in @var{FILE}. -@cindex @file{@value{src::default-output-filename}} +@cindex @file{@value{srcCOLONCOLONdefaultDASHoutputDASHfilename}} @cindex default output filename @cindex output filename, default If @option{--output} is not specified, the default is to put the -resulting image in @file{@value{src::default-output-filename}}. +resulting image in @file{@value{srcCOLONCOLONdefaultDASHoutputDASHfilename}}. @item --parameter=@var{KEY}[=@var{VALUE}]:@dots{} @opindex --parameter @@ -656,7 +656,7 @@ estimations of required memory in selected processing steps @end table The default verbosity level of Enblend is -@value{src::default-verbosity-level}. +@value{srcCOLONCOLONdefaultDASHverbosityDASHlevel}. @item -V @itemx --version @@ -1363,10 +1363,10 @@ be, and the longer it will take. Append a percent sign (@samp{%}) to specify @var{TAU} as a percentage. -Valid range: @value{src::minimum-anneal-tau} < @var{TAU} < -@value{src::maximum-anneal-tau}. +Valid range: @value{srcCOLONCOLONminimumDASHannealDASHtau} < @var{TAU} < +@value{srcCOLONCOLONmaximumDASHannealDASHtau}. -The default is @value{src::default-anneal-tau}; values around 0.95 are +The default is @value{srcCOLONCOLONdefaultDASHannealDASHtau}; values around 0.95 are reasonable. Usually, slower cooling results in more converged points. @item DELTA-E-MAX @@ -1374,7 +1374,7 @@ reasonable. Usually, slower cooling results in more converged points. @var{DELTA-E-MAX} and @var{DELTA-E-MIN} are the maximum and minimum cost change possible by any single annealing move. -Valid range: @value{src::minimum-anneal-deltae-min} < +Valid range: @value{srcCOLONCOLONminimumDASHannealDASHdeltaeDASHmin} < @var{DELTA-E-MIN} < @var{DELTA-E-MAX}. In particular they determine the initial and final annealing @@ -1545,17 +1545,17 @@ $$\eqalign{ @end docbook The defaults are: @var{DELTA-E-MAX}: -@value{src::default-anneal-deltae-max} and @var{DELTA-E-MIN}: -@value{src::default-anneal-deltae-min}. +@value{srcCOLONCOLONdefaultDASHannealDASHdeltaeDASHmax} and @var{DELTA-E-MIN}: +@value{srcCOLONCOLONdefaultDASHannealDASHdeltaeDASHmin}. @item K-MAX @var{K-MAX} is the maximum number of ``moves'' the optimizer will make for each line segment. Higher values more accurately sample the state space, at the expense of a higher computation cost. -Valid range: @var{K-MAX} @geq{} @value{src::minimum-anneal-kmax}. +Valid range: @var{K-MAX} @geq{} @value{srcCOLONCOLONminimumDASHannealDASHkmax}. -The default is @value{src::default-anneal-kmax}. Values around 100 +The default is @value{srcCOLONCOLONdefaultDASHannealDASHkmax}. Values around 100 seem reasonable. @end table @@ -1569,10 +1569,10 @@ the seam line and the amount of memory necessary to do so. It is the default. If omitted @var{FACTOR} defaults to -@value{src::default-coarseness-factor}, this means, +@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}, this means, option@tie{}@option{--coarse-mask} shrinks the overlapping @emph{areas} by a factor of -@math{@value{src::default-coarseness-factor}@classictimes{}@/@value{src::default-coarseness-factor}}. +@math{@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@classictimes{}@/@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}}. With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a run of Enblend shrinks approximately by 80% and the maximum amount of memory in use at a time is decreased to 60% (Enblend compiled with @@ -1630,9 +1630,9 @@ A small value prefers straight line segments and thus shorter seam lines. Larger values instruct the optimizer to let the seam line take more detours when searching for the best seam line. -Valid range: @var{RADIUS} @geq{} @value{src::minimum-dijkstra-radius}. +Valid range: @var{RADIUS} @geq{} @value{srcCOLONCOLONminimumDASHdijkstraDASHradius}. -Default: @value{src::default-dijkstra-radius}@dmn{pixels}. +Default: @value{srcCOLONCOLONdefaultDASHdijkstraDASHradius}@dmn{pixels}. @item --fine-mask @opindex --fine-mask @@ -2240,8 +2240,8 @@ normalizes the sum of @var{LUMINANCE-WEIGHT} and @samp{--image-difference=delta-e:0.6667:0.3333} define the same weighting function. -The default @var{LUMINANCE-WEIGHT} is @value{src::default-luminance-difference-weight} -and the default @var{CHROMINANCE-WEIGHT} is @value{src::default-chrominance-difference-weight}. +The default @var{LUMINANCE-WEIGHT} is @value{srcCOLONCOLONdefaultDASHluminanceDASHdifferenceDASHweight} +and the default @var{CHROMINANCE-WEIGHT} is @value{srcCOLONCOLONdefaultDASHchrominanceDASHdifferenceDASHweight}. @cindex match quality @cindex quality, match @@ -2258,7 +2258,7 @@ quality with lower values meaning better matches. @cindex mask, load @cindex load mask Instead of generating masks, use those in @var{IMAGE-TEMPLATE}. The -default is @file{@value{src::default-mask-template}}. The mask images +default is @file{@value{srcCOLONCOLONdefaultDASHmaskDASHtemplate}}. The mask images have to be a 8-bit grayscale images. See @option{--save-masks} below for details. @@ -2281,7 +2281,7 @@ The unit of @var{DISTANCE} is pixels unless it is a percentage as explained in the next paragraph. In fine masks one mask pixel corresponds to one pixel in the input image, whereas in coarse masks one pixel represents for example -@value{src::default-coarseness-factor}@dmn{pixels} in the input image. +@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@dmn{pixels} in the input image. Append a percentage sign (@samp{%}) to @var{DISTANCE} to specify the segment length as a fraction of the diagonal of the rectangle @@ -2306,14 +2306,14 @@ are closer to one, and blurring of the difference image with option@tie{}@option{--smooth-difference}. Use option@tie{}@option{--visualize} to check the results. -Valid range: @var{DISTANCE} @geq{} @value{src::minimum-vectorize-distance}. +Valid range: @var{DISTANCE} @geq{} @value{srcCOLONCOLONminimumDASHvectorizeDASHdistance}. Enblend limits @var{DISTANCE} so that it never gets below -@value{src::minimum-vectorize-distance} even if it has been given as a +@value{srcCOLONCOLONminimumDASHvectorizeDASHdistance} even if it has been given as a percentage. The user will be warned in such cases. -Default: @value{src::coarse-mask-vectorize-distance}@dmn{pixels} for -coarse masks and @value{src::fine-mask-vectorize-distance}@dmn{pixels} +Default: @value{srcCOLONCOLONcoarseDASHmaskDASHvectorizeDASHdistance}@dmn{pixels} for +coarse masks and @value{srcCOLONCOLONfineDASHmaskDASHvectorizeDASHdistance}@dmn{pixels} for fine masks. @item --no-optimize @@ -2392,7 +2392,7 @@ The optimizer weights@tie{}@var{DISTANCE-WEIGHT} and @var{MISMATCH-WEIGHT} define how to weight these two criteria. Enblend up to version@tie{}3.2 used 1:1. This version of Enblend (@value{VERSION}) uses -@value{src::default-optimizer-weight-distance}:@value{src::default-optimizer-weight-mismatch}. +@value{srcCOLONCOLONdefaultDASHoptimizerDASHweightDASHdistance}:@value{srcCOLONCOLONdefaultDASHoptimizerDASHweightDASHmismatch}. A large @var{DISTANCE-WEIGHT} pulls the optimized seam line closer to the initial postion. A large @var{MISMATCH-WEIGHT} makes the seam @@ -2440,7 +2440,7 @@ See @ref{Primary Seam Generators} for details. @cindex mask, save @cindex save mask Save the generated masks to @var{IMAGE-TEMPLATE}. The default is -@file{@value{src::default-mask-template}}. Enblend saves masks as +@file{@value{srcCOLONCOLONdefaultDASHmaskDASHtemplate}}. Enblend saves masks as 8@dmn{bit} grayscale (single channel) images. For accuracy we recommend to choose a lossless format. @@ -2497,7 +2497,7 @@ smoothing occurs @emph{after} the overlap regions have been shrunken. Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR} times larger area in the original images. -Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}. +Valid range: @var{RADIUS} @geq{} @value{srcCOLONCOLONminimumDASHsmoothDASHdifference}. @item --visualize[=@var{VISUALIZE-TEMPLATE}] @opindex --visualize @@ -2505,7 +2505,7 @@ Valid range: @var{RADIUS} @geq{} @value{src::minimum-smooth-difference}. @cindex visualization of mask Create an image according to @var{VISUALIZE-TEMPLATE} that visualizes the unoptimized mask and the applied optimizations (if any). The default is -@file{@value{src::default-visualize-template}}. +@file{@value{srcCOLONCOLONdefaultDASHvisualizeDASHtemplate}}. The image shows Enblend's view of the overlap region and how it decided to route the seam line. If you are experiencing artifacts or @@ -2529,49 +2529,49 @@ in the rectangular region where two images overlap. The larger the difference the lighter shade of gray it appears in the visualization image. Enblend paints the non-overlapping parts of the image pair -- these are the regions where @emph{no} blending occurs -- in -@value{src::visualize-no-overlap-value-color}. +@value{srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor}. @ref{Table:visualization-colors} shows the meanings of all the colors that are used in seam-line visualization images. @float Table,Table:visualization-colors @table @asis @dbtitle{Visualization Colors} -@item @value{src::visualize-no-overlap-value-color} +@item @value{srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor} Non-overlapping parts of image pair. @item various shades of gray Difference of the pixel values in the overlap region. -@item @value{src::visualize-state-space-color} +@item @value{srcCOLONCOLONvisualizeDASHstateDASHspaceDASHcolor} Location of an optimizer sample. -@item @value{src::visualize-first-vertex-value-color} +@item @value{srcCOLONCOLONvisualizeDASHfirstDASHvertexDASHvalueDASHcolor} First sample of a line segment. -@item @value{src::visualize-next-vertex-value-color} +@item @value{srcCOLONCOLONvisualizeDASHnextDASHvertexDASHvalueDASHcolor} Any other but first sample of a line segment. -@item @value{src::visualize-state-space-inside-color} +@item @value{srcCOLONCOLONvisualizeDASHstateDASHspaceDASHinsideDASHcolor} @cindex @sc{Dijkstra} radius @cindex radius, @sc{Dijkstra} State space sample inside the @sc{Dijkstra} radius. -@item @value{src::visualize-state-space-unconverged-color} +@item @value{srcCOLONCOLONvisualizeDASHstateDASHspaceDASHunconvergedDASHcolor} Non-converged point. -@item @value{src::visualize-initial-path-color} +@item @value{srcCOLONCOLONvisualizeDASHinitialDASHpathDASHcolor} @cindex nearest-feature transform (@acronym{NFT}), Graph-Cut (@acronym{GC}) Initial seam line as generated by the primary seam generator. @cindex frozen seam-line endpoint @cindex seam-line endpoint, frozen Enblend marks a non-movable (``frozen'') endpoint of a seam-line -segment with a @value{src::visualize-frozen-point} -@value{src::mark-frozen-point}, whereas it uses a -@value{src::visualize-movable-point} @value{src::mark-movable-point} +segment with a @value{srcCOLONCOLONvisualizeDASHfrozenDASHpoint} +@value{srcCOLONCOLONmarkDASHfrozenDASHpoint}, whereas it uses a +@value{srcCOLONCOLONvisualizeDASHmovableDASHpoint} @value{srcCOLONCOLONmarkDASHmovableDASHpoint} to denote an endpoint that the optimizer is allowed to move around. -@item @value{src::visualize-short-path-value-color} +@item @value{srcCOLONCOLONvisualizeDASHshortDASHpathDASHvalueDASHcolor} Final seam line. @end table @@ -2591,15 +2591,15 @@ Final seam line. visualization. It was produced with an Enblend run at all defaults, but @option{--fine-mask} and @option{--visualize} enabled. -The large @value{src::visualize-no-overlap-value-color} border is +The large @value{srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor} border is ``off-limits'' for Enblend, for the images do not overlap there. The -dark wedge inside the @value{src::visualize-no-overlap-value-color} +dark wedge inside the @value{srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor} frame is where the images share a common region. -The initial seam-line (@value{src::visualize-initial-path-color}) is +The initial seam-line (@value{srcCOLONCOLONvisualizeDASHinitialDASHpathDASHcolor}) is almost straight with the exception of a single bend on the left side of the image and the final seam-line -(@value{src::visualize-short-path-value-color}) meanders around it. +(@value{srcCOLONCOLONvisualizeDASHshortDASHpathDASHvalueDASHcolor}) meanders around it. @ifhtml @float Figure,Figure:seam-line-visualization diff --git a/doc/enfuse.texi b/doc/enfuse.texi index 0dd8c23..d04b9f5 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -561,7 +561,7 @@ However, @uref{http://@/hci.iwr.uni-@/heidelberg.de/@/vigra/, @cindex layer selection @cindex layer selection Override the standard layer selector algorithm, which is -@samp{@value{src::layer-selector}}. +@samp{@value{srcCOLONCOLONlayerDASHselector}}. This version of Enfuse offers the following algorithms: @table @code @@ -701,8 +701,8 @@ pyramids. Use @samp{auto} or @samp{automatic} as @var{LEVELS} to restore the automatic calculation of the maximum number of levels. The valid range of the absolute value of @var{LEVELS} is -@value{src::minimum-pyramid-levels} to -@value{src::maximum-pyramid-levels}. +@value{srcCOLONCOLONminimumDASHpyramidDASHlevels} to +@value{srcCOLONCOLONmaximumDASHpyramidDASHlevels}. @item -o @itemx --output=@var{FILE} @@ -710,11 +710,11 @@ The valid range of the absolute value of @var{LEVELS} is @opindex --output Place output in @var{FILE}. -@cindex @file{@value{src::default-output-filename}} +@cindex @file{@value{srcCOLONCOLONdefaultDASHoutputDASHfilename}} @cindex default output filename @cindex output filename, default If @option{--output} is not specified, the default is to put the -resulting image in @file{@value{src::default-output-filename}}. +resulting image in @file{@value{srcCOLONCOLONdefaultDASHoutputDASHfilename}}. @item --parameter=@var{KEY}[=@var{VALUE}]:@dots{} Set a @var{KEY}-@var{VALUE} pair, where @var{VALUE} is optional. This @@ -768,7 +768,7 @@ estimations of required memory in selected processing steps @end table The default verbosity level of Enfuse is -@value{src::default-verbosity-level}. +@value{srcCOLONCOLONdefaultDASHverbosityDASHlevel}. @item -V @itemx --version @@ -1396,10 +1396,10 @@ contributes to the output image. Sets the relative @var{WEIGHT} of high local-contrast pixels. -Valid range: @value{src::minimum-weight-contrast} @leq{} @var{WEIGHT} -@leq{} @value{src::maximum-weight-contrast}. +Valid range: @value{srcCOLONCOLONminimumDASHweightDASHcontrast} @leq{} @var{WEIGHT} +@leq{} @value{srcCOLONCOLONmaximumDASHweightDASHcontrast}. -Default: @value{src::default-weight-contrast}. +Default: @value{srcCOLONCOLONdefaultDASHweightDASHcontrast}. See @ref{Local Contrast Weighting} and @ref{Expert Options, Option contrast-window-size}. @@ -1410,10 +1410,10 @@ contrast-window-size}. Sets the relative @var{WEIGHT} of high local entropy pixels. -Valid range: @value{src::minimum-weight-entropy} @leq{} @var{WEIGHT} -@leq{} @value{src::maximum-weight-entropy}. +Valid range: @value{srcCOLONCOLONminimumDASHweightDASHentropy} @leq{} @var{WEIGHT} +@leq{} @value{srcCOLONCOLONmaximumDASHweightDASHentropy}. -Default: @value{src::default-weight-entropy}. +Default: @value{srcCOLONCOLONdefaultDASHweightDASHentropy}. See @ref{Local Entropy Weighting} and @ref{Expert Options, Options entropy-window-size and entropy-cutoff}. @@ -1426,10 +1426,10 @@ Sets the relative @var{WEIGHT} of the well-exposedness criterion. Increasing this weight relative to the others will make well-exposed pixels contribute more to the final output. -Valid range: @value{src::minimum-weight-exposure} @leq{} @var{WEIGHT} -@leq{} @value{src::maximum-weight-exposure}. +Valid range: @value{srcCOLONCOLONminimumDASHweightDASHexposure} @leq{} @var{WEIGHT} +@leq{} @value{srcCOLONCOLONmaximumDASHweightDASHexposure}. -Default: @value{src::default-weight-exposure}. +Default: @value{srcCOLONCOLONdefaultDASHweightDASHexposure}. @xref{Exposure Weighting}. @@ -1439,10 +1439,10 @@ Default: @value{src::default-weight-exposure}. Set the @var{MEAN} (this is, the center) of the Gaussian exposure weight curve. -Valid range: @value{src::minimum-exposure-mu} @leq{} @var{MEAN} -@leq{} @value{src::maximum-exposure-mu}. +Valid range: @value{srcCOLONCOLONminimumDASHexposureDASHmu} @leq{} @var{MEAN} +@leq{} @value{srcCOLONCOLONmaximumDASHexposureDASHmu}. -Default: @value{src::default-exposure-mu}. +Default: @value{srcCOLONCOLONdefaultDASHexposureDASHmu}. Use this option to fine-tune exposure weighting (@pxref{Exposure Weighting}). @@ -1454,9 +1454,9 @@ Standard deviation @var{STD-DEV} of the Gaussian exposure weight curve. Low numbers give less weight to pixels that are far from @option{--wMu} and vice versa. -Valid range: @var{STD-DEV} @geq{} @value{src::minimum-exposure-sigma}. +Valid range: @var{STD-DEV} @geq{} @value{srcCOLONCOLONminimumDASHexposureDASHsigma}. -Default: @value{src::default-exposure-sigma}. +Default: @value{srcCOLONCOLONdefaultDASHexposureDASHsigma}. Use this option to fine-tune exposure weighting (@pxref{Exposure Weighting}). @@ -1468,10 +1468,10 @@ Sets the relative @var{WEIGHT} of high-saturation pixels. Increasing this weight makes pixels with high saturation contribute more to the final output. -Valid range: @value{src::minimum-weight-saturation} -@leq{} @var{WEIGHT} @leq{} @value{src::maximum-weight-saturation}. +Valid range: @value{srcCOLONCOLONminimumDASHweightDASHsaturation} +@leq{} @var{WEIGHT} @leq{} @value{srcCOLONCOLONmaximumDASHweightDASHsaturation}. -Default: @value{src::default-weight-saturation}. +Default: @value{srcCOLONCOLONdefaultDASHweightDASHsaturation}. Saturation weighting is only defined for color images. @xref{Saturation Weighting}. @@ -1494,7 +1494,7 @@ to read the manual before applying them successfully. A non-zero value for @var{EDGE-SCALE} switches on the Laplacian-of-Gaussian (@acronym{LoG}) edge detection algorithm. @var{EDGE-SCALE} is the radius of the Gaussian used in the search for -edges. Default: @value{src::default-edge-scale}@dmn{pixels}. +edges. Default: @value{srcCOLONCOLONdefaultDASHedgeDASHscale}@dmn{pixels}. A positive @var{LCE-SCALE} turns on local contrast enhancement (@acronym{LCE}) before the @acronym{LoG} edge detection. @@ -1505,8 +1505,8 @@ step, @var{LCE-FACTOR} is the weight factor (``strength''). @minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original}, @var{LCE-SCALE}). -@var{LCE-SCALE} defaults to @value{src::default-lce-scale} pixels and -@var{LCE-FACTOR} defaults to @value{src::default-lce-factor}. Append +@var{LCE-SCALE} defaults to @value{srcCOLONCOLONdefaultDASHlceDASHscale} pixels and +@var{LCE-FACTOR} defaults to @value{srcCOLONCOLONdefaultDASHlceDASHfactor}. Append @samp{%} to @var{LCE-SCALE} to specify the radius as a percentage of @var{EDGE-SCALE}. Append @samp{%} to @var{LCE-FACTOR} to specify the weight as a percentage. @@ -1515,7 +1515,7 @@ weight as a percentage. @opindex --contrast-min-curvature Define the minimum @var{CURVATURE} for the @acronym{LoG} edge -detection. Default: @value{src::default-minimum-curvature}. Append a +detection. Default: @value{srcCOLONCOLONdefaultDASHminimumDASHcurvature}. Append a @samp{%} to specify the minimum curvature relative to maximum pixel value in the source image (for example 255 or 65535). @@ -1539,9 +1539,9 @@ For contrast analysis @var{SIZE} values larger than 5 might result in a blurry composite image. Values of 3 and 5 have given good results on focus stacks. -Valid range: @var{SIZE} @geq{} @value{src::minimum-contrast-window-size}. +Valid range: @var{SIZE} @geq{} @value{srcCOLONCOLONminimumDASHcontrastDASHwindowDASHsize}. -Default: @value{src::default-contrast-window-size}@dmn{pixels}. +Default: @value{srcCOLONCOLONdefaultDASHcontrastDASHwindowDASHsize}@dmn{pixels}. See also @ref{Fusion Options, Option --contrast-weight} and @option{--hard-mask} below. @@ -1558,8 +1558,8 @@ treated as pure white. For color images @var{LOWER-CUTOFF} and @var{UPPER-CUTOFF} are applied separately and independently to each channel. -Defaults: @value{src::default-entropy-lower-cutoff} for -@var{LOWER-CUTOFF} and @value{src::default-entropy-upper-cutoff} for +Defaults: @value{srcCOLONCOLONdefaultDASHentropyDASHlowerDASHcutoff} for +@var{LOWER-CUTOFF} and @value{srcCOLONCOLONdefaultDASHentropyDASHupperDASHcutoff} for @var{UPPER-CUTOFF}, that is, all pixels' values are taken into account. Append a @samp{%} to specify the cutoff relative to maximum pixel value in the source image (for example 255 or 65535). @@ -1591,9 +1591,9 @@ In the entropy calculation @var{SIZE} values of 3 to 7 yield an acceptable compromise of the locality of the information and the significance of the local entropy value itself. -Valid range: @var{SIZE} @geq{} @value{src::minimum-entropy-window-size}. +Valid range: @var{SIZE} @geq{} @value{srcCOLONCOLONminimumDASHentropyDASHwindowDASHsize}. -Default: @value{src::default-entropy-window-size}@dmn{pixels}. +Default: @value{srcCOLONCOLONdefaultDASHentropyDASHwindowDASHsize}@dmn{pixels}. If given an even @var{SIZE} Enfuse will automatically use the next odd number. @@ -1654,8 +1654,8 @@ exposure-weight curve this option changes the brightness of the resulting image: increasing @var{LOWER-CUTOFF} lightens the final image and lowering @var{UPPER-CUTOFF} darkens it. -Defaults: @value{src::default-exposure-lower-cutoff} for -@var{LOWER-CUTOFF} and @value{src::default-exposure-upper-cutoff} for +Defaults: @value{srcCOLONCOLONdefaultDASHexposureDASHlowerDASHcutoff} for +@var{LOWER-CUTOFF} and @value{srcCOLONCOLONdefaultDASHexposureDASHupperDASHcutoff} for @var{UPPER-CUTOFF}, that is, all pixels' values are weighted according to the ``uncut'' exposure-weight curve. @@ -1666,8 +1666,8 @@ value in the source image (for example 255 or 65535). The gray-scale projectors @var{LOWER-PROJECTOR} and @var{UPPER-PROJECTOR} default to -@samp{@value{src::default-exposure-lower-cutoff-projector}} and -@samp{@value{src::default-exposure-upper-cutoff-projector}}, which are +@samp{@value{srcCOLONCOLONdefaultDASHexposureDASHlowerDASHcutoffDASHprojector}} and +@samp{@value{srcCOLONCOLONdefaultDASHexposureDASHupperDASHcutoffDASHprojector}}, which are usually the best choices for effective cutoff operations on the respective ends. @@ -2202,8 +2202,8 @@ The masks have to be a grayscale images. First form: Load all soft-weight masks from files that were previously saved with option@tie{}@option{--save-masks}. If option@tie{}@option{--hard-mask} is effective only load hard masks. -The defaults are @file{@value{src::default-soft-mask-template}} and -@file{@value{src::default-hard-mask-template}}. +The defaults are @file{@value{srcCOLONCOLONdefaultDASHsoftDASHmaskDASHtemplate}} and +@file{@value{srcCOLONCOLONdefaultDASHhardDASHmaskDASHtemplate}}. @cindex filename template @cindex mask, filename template In the second form, @var{SOFT-MASK-TEMPLATE} defines the names of the @@ -2225,8 +2225,8 @@ Save the generated weight masks to image files. First form: Save all soft-weight masks in files. If option@tie{}@option{--hard-mask} is effective also save the hard masks. -The defaults are @file{@value{src::default-soft-mask-template}} and -@file{@value{src::default-hard-mask-template}}. +The defaults are @file{@value{srcCOLONCOLONdefaultDASHsoftDASHmaskDASHtemplate}} and +@file{@value{srcCOLONCOLONdefaultDASHhardDASHmaskDASHtemplate}}. @cindex filename template @cindex mask, filename template In the second form, @var{SOFT-MASK-TEMPLATE} defines the names of the @@ -3139,10 +3139,10 @@ means they are @emph{active}. @float Table,Table:default-weights @multitable {Local Contrast} {0.0} @headitem Criterion @tab Weight -@item Exposure @tab @value{src::default-weight-exposure} -@item Saturation @tab @value{src::default-weight-saturation} -@item Local Contrast @tab @value{src::default-weight-contrast} -@item Local Entropy @tab @value{src::default-weight-entropy} +@item Exposure @tab @value{srcCOLONCOLONdefaultDASHweightDASHexposure} +@item Saturation @tab @value{srcCOLONCOLONdefaultDASHweightDASHsaturation} +@item Local Contrast @tab @value{srcCOLONCOLONdefaultDASHweightDASHcontrast} +@item Local Entropy @tab @value{srcCOLONCOLONdefaultDASHweightDASHentropy} @end multitable @caption{Enfuse's default weights as compiled into version@tie{}@value{VERSION}.} @@ -3306,8 +3306,8 @@ $$ @noindent whose center@tie{}@math{Mu} and width@tie{}@math{Sigma} are controlled by the command line options@tie{}@option{--exposure-mu} and @option{--exposure-sigma} -respectively. @math{Mu} defaults to @value{src::default-exposure-mu} -and @math{Sigma} defaults to @value{src::default-exposure-sigma}. +respectively. @math{Mu} defaults to @value{srcCOLONCOLONdefaultDASHexposureDASHmu} +and @math{Sigma} defaults to @value{srcCOLONCOLONdefaultDASHexposureDASHsigma}. @ref{Figure:gaussian} shows a Gaussian. @float Figure,Figure:gaussian @@ -4574,7 +4574,7 @@ option@tie{}@option{--contrast-min-curvature} with a @emph{negative} argument@tie{}@var{CURVATURE} to suppress all edges with a curvature below @minus{}@var{CURVATURE} (which is a positive value). Check the effects with the mask files and particularly the hard-mask files -(@file{@value{src::default-hard-mask-template}}) if using +(@file{@value{srcCOLONCOLONdefaultDASHhardDASHmaskDASHtemplate}}) if using option@tie{}@option{--hard-mask}. To indicate the @var{CURVATURE} in relative terms, which is @@ -5198,8 +5198,8 @@ multitude of techniques like, for example, differences. The most prominent method in this class is dark-frame subtraction. The defaults set -@samp{--exposure-weight=@value{src::default-weight-exposure}} and -@samp{--saturation-weight=@value{src::default-weight-saturation}}. +@samp{--exposure-weight=@value{srcCOLONCOLONdefaultDASHweightDASHexposure}} and +@samp{--saturation-weight=@value{srcCOLONCOLONdefaultDASHweightDASHsaturation}}. Eliminating the saturation component with @samp{--saturation-weight=0.0} can be worth an extra run. @@ -5219,8 +5219,8 @@ functions to automate recording exposure series. See the instruction manual of your model for details. Enfuse's defaults, -@samp{--exposure-weight=@value{src::default-weight-exposure}} and -@samp{--saturation-weight=@value{src::default-weight-saturation}} are +@samp{--exposure-weight=@value{srcCOLONCOLONdefaultDASHweightDASHexposure}} and +@samp{--saturation-weight=@value{srcCOLONCOLONdefaultDASHweightDASHsaturation}} are well suited for fusion of @emph{color} images. Remember that saturation weighting only works for @acronym{RGB} data. Option@tie{}@option{--saturation-weight} helps to control burnt-out @@ -5462,11 +5462,11 @@ Here is what each option causes: @table @option @item --exposure-weight=0 Switch @strong{off} exposure based pixel selection. The default -weight is @value{src::default-weight-exposure}. +weight is @value{srcCOLONCOLONdefaultDASHweightDASHexposure}. @item --saturation-weight=0 Switch @strong{off} saturation based pixel selection. The default -weight is @value{src::default-weight-saturation}. +weight is @value{srcCOLONCOLONdefaultDASHweightDASHsaturation}. @item --contrast-weight=1 Switch @strong{on} pixel selection based on local contrast. @@ -5626,8 +5626,8 @@ Typically, @var{SCALE} ranges between 0.1@dmn{pixels} and find the best value for @var{SCALE} though, usually some experimentation will be necessary. Use @option{--save-masks} to get all soft-mask (default: -@file{@value{src::default-soft-mask-template}}) and hard-mask files -(default: @file{@value{src::default-hard-mask-template}}). Check how +@file{@value{srcCOLONCOLONdefaultDASHsoftDASHmaskDASHtemplate}}) and hard-mask files +(default: @file{@value{srcCOLONCOLONdefaultDASHhardDASHmaskDASHtemplate}}). Check how different scales affect the artifacts. Also @pxref{Understanding Masks}. diff --git a/doc/varsenblend.texi b/doc/varsenblend.texi index ea48ee8..bc0392d 100644 --- a/doc/varsenblend.texi +++ b/doc/varsenblend.texi @@ -1,132 +1,132 @@ @c enblend.cc:96 -@set src::coarse-mask-vectorize-distance 4 +@set srcCOLONCOLONcoarseDASHmaskDASHvectorizeDASHdistance 4 @c enblend.cc:135 -@set src::default-anneal-deltae-max 7000.0 +@set srcCOLONCOLONdefaultDASHannealDASHdeltaeDASHmax 7000.0 @c enblend.cc:136 -@set src::default-anneal-deltae-min 5.0 +@set srcCOLONCOLONdefaultDASHannealDASHdeltaeDASHmin 5.0 @c enblend.cc:133 -@set src::default-anneal-kmax 32 +@set srcCOLONCOLONdefaultDASHannealDASHkmax 32 @c enblend.cc:134 -@set src::default-anneal-tau 0.75 +@set srcCOLONCOLONdefaultDASHannealDASHtau 0.75 @c enblend.cc:120 -@set src::default-chrominance-difference-weight 1.0 +@set srcCOLONCOLONdefaultDASHchrominanceDASHdifferenceDASHweight 1.0 @c enblend.cc:117 -@set src::default-coarseness-factor 8 +@set srcCOLONCOLONdefaultDASHcoarsenessDASHfactor 8 @c enblend.cc:118 -@set src::default-difference-functor Delta-E +@set srcCOLONCOLONdefaultDASHdifferenceDASHfunctor Delta-E @c enblend.cc:138 -@set src::default-dijkstra-radius 25 +@set srcCOLONCOLONdefaultDASHdijkstraDASHradius 25 @c enblend.cc:119 -@set src::default-luminance-difference-weight 1.0 +@set srcCOLONCOLONdefaultDASHluminanceDASHdifferenceDASHweight 1.0 @c enblend.cc:124 -@set src::default-mask-template mask-%n.tif +@set srcCOLONCOLONdefaultDASHmaskDASHtemplate mask-%n.tif @c enblend.cc:130 -@set src::default-optimizer-weight-distance 8.0 +@set srcCOLONCOLONdefaultDASHoptimizerDASHweightDASHdistance 8.0 @c enblend.cc:131 -@set src::default-optimizer-weight-mismatch 1.0 +@set srcCOLONCOLONdefaultDASHoptimizerDASHweightDASHmismatch 1.0 @c global.h:77 -@set src::default-output-filename a.tif +@set srcCOLONCOLONdefaultDASHoutputDASHfilename a.tif @c global.h:152 -@set src::default-tiff-resolution 300@dmn{dpi} +@set srcCOLONCOLONdefaultDASHtiffDASHresolution 300@dmn{dpi} @c enblend.cc:101 -@set src::default-verbosity-level 1 +@set srcCOLONCOLONdefaultDASHverbosityDASHlevel 1 @c enblend.cc:127 -@set src::default-visualize-template vis-%n.tif +@set srcCOLONCOLONdefaultDASHvisualizeDASHtemplate vis-%n.tif @c enblend.cc:97 -@set src::fine-mask-vectorize-distance 20 +@set srcCOLONCOLONfineDASHmaskDASHvectorizeDASHdistance 20 @c enblend.cc:1683 -@set src::layer-selector all-layers +@set srcCOLONCOLONlayerDASHselector all-layers @c common.h:122 -@set src::mark-frozen-point cross +@set srcCOLONCOLONmarkDASHfrozenDASHpoint cross @c common.h:118 -@set src::mark-movable-point diamond +@set srcCOLONCOLONmarkDASHmovableDASHpoint diamond @c enblend.cc:1131 -@set src::maximum-anneal-tau 1 +@set srcCOLONCOLONmaximumDASHannealDASHtau 1 @c common.h:56 -@set src::maximum-pyramid-levels 29 +@set srcCOLONCOLONmaximumDASHpyramidDASHlevels 29 @c enblend.cc:1158 -@set src::minimum-anneal-deltae-max 0 +@set srcCOLONCOLONminimumDASHannealDASHdeltaeDASHmax 0 @c enblend.cc:1185 -@set src::minimum-anneal-deltae-min 0 +@set srcCOLONCOLONminimumDASHannealDASHdeltaeDASHmin 0 @c enblend.cc:1218 -@set src::minimum-anneal-kmax 3 +@set srcCOLONCOLONminimumDASHannealDASHkmax 3 @c enblend.cc:1124 -@set src::minimum-anneal-tau 0 +@set srcCOLONCOLONminimumDASHannealDASHtau 0 @c enblend.cc:1366 -@set src::minimum-cache-block-size 1@dmn{KB} +@set srcCOLONCOLONminimumDASHcacheDASHblockDASHsize 1@dmn{KB} @c enblend.cc:1491 -@set src::minimum-cache-size 1@dmn{MB} +@set srcCOLONCOLONminimumDASHcacheDASHsize 1@dmn{MB} @c enblend.cc:1351 -@set src::minimum-dijkstra-radius 1 +@set srcCOLONCOLONminimumDASHdijkstraDASHradius 1 @c bounds.h:120 -@set src::minimum-pyramid-levels 1 +@set srcCOLONCOLONminimumDASHpyramidDASHlevels 1 @c enblend.cc:1282 -@set src::minimum-smooth-difference 0.0 +@set srcCOLONCOLONminimumDASHsmoothDASHdifference 0.0 @c enblend.cc:95 -@set src::minimum-vectorize-distance 4 +@set srcCOLONCOLONminimumDASHvectorizeDASHdistance 4 @c enblend.cc:1327 -@set src::minimum-verbosity-level 0 +@set srcCOLONCOLONminimumDASHverbosityDASHlevel 0 @c common.h:128 -@set src::visualize-first-vertex-value-color medium green +@set srcCOLONCOLONvisualizeDASHfirstDASHvertexDASHvalueDASHcolor medium green @c common.h:120 -@set src::visualize-frozen-point bright white +@set srcCOLONCOLONvisualizeDASHfrozenDASHpoint bright white @c common.h:124 -@set src::visualize-initial-path-color dark yellow +@set srcCOLONCOLONvisualizeDASHinitialDASHpathDASHcolor dark yellow @c common.h:116 -@set src::visualize-movable-point light orange +@set srcCOLONCOLONvisualizeDASHmovableDASHpoint light orange @c common.h:130 -@set src::visualize-next-vertex-value-color light green +@set srcCOLONCOLONvisualizeDASHnextDASHvertexDASHvalueDASHcolor light green @c common.h:132 -@set src::visualize-no-overlap-value-color dark red +@set srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor dark red @c common.h:126 -@set src::visualize-short-path-value-color bright yellow +@set srcCOLONCOLONvisualizeDASHshortDASHpathDASHvalueDASHcolor bright yellow @c common.h:134 -@set src::visualize-state-space-color dark blue +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHcolor dark blue @c common.h:136 -@set src::visualize-state-space-inside-color bright cyan +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHinsideDASHcolor bright cyan @c common.h:138 -@set src::visualize-state-space-unconverged-color bright magenta +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHunconvergedDASHcolor bright magenta diff --git a/doc/varsenfuse.texi b/doc/varsenfuse.texi index dbd5146..f0bbd22 100644 --- a/doc/varsenfuse.texi +++ b/doc/varsenfuse.texi @@ -1,162 +1,162 @@ @c enfuse.cc:105 -@set src::default-contrast-window-size 5 +@set srcCOLONCOLONdefaultDASHcontrastDASHwindowDASHsize 5 @c enfuse.cc:108 -@set src::default-edge-scale 0.0 +@set srcCOLONCOLONdefaultDASHedgeDASHscale 0.0 @c enfuse.cc:114 -@set src::default-entropy-lower-cutoff 0% +@set srcCOLONCOLONdefaultDASHentropyDASHlowerDASHcutoff 0% @c enfuse.cc:115 -@set src::default-entropy-upper-cutoff 100% +@set srcCOLONCOLONdefaultDASHentropyDASHupperDASHcutoff 100% @c enfuse.cc:113 -@set src::default-entropy-window-size 3 +@set srcCOLONCOLONdefaultDASHentropyDASHwindowDASHsize 3 @c enfuse.cc:95 -@set src::default-exposure-lower-cutoff 0% +@set srcCOLONCOLONdefaultDASHexposureDASHlowerDASHcutoff 0% @c enfuse.cc:97 -@set src::default-exposure-lower-cutoff-projector anti-value +@set srcCOLONCOLONdefaultDASHexposureDASHlowerDASHcutoffDASHprojector anti-value @c enfuse.cc:102 -@set src::default-exposure-mu 0.5 +@set srcCOLONCOLONdefaultDASHexposureDASHmu 0.5 @c enfuse.cc:103 -@set src::default-exposure-sigma 0.2 +@set srcCOLONCOLONdefaultDASHexposureDASHsigma 0.2 @c enfuse.cc:96 -@set src::default-exposure-upper-cutoff 100% +@set srcCOLONCOLONdefaultDASHexposureDASHupperDASHcutoff 100% @c enfuse.cc:98 -@set src::default-exposure-upper-cutoff-projector value +@set srcCOLONCOLONdefaultDASHexposureDASHupperDASHcutoffDASHprojector value @c enfuse.cc:121 -@set src::default-hard-mask-template hardmask-%n.tif +@set srcCOLONCOLONdefaultDASHhardDASHmaskDASHtemplate hardmask-%n.tif @c enfuse.cc:110 -@set src::default-lce-factor 0.0 +@set srcCOLONCOLONdefaultDASHlceDASHfactor 0.0 @c enfuse.cc:109 -@set src::default-lce-scale 0.0 +@set srcCOLONCOLONdefaultDASHlceDASHscale 0.0 @c enfuse.cc:112 -@set src::default-minimum-curvature 0 +@set srcCOLONCOLONdefaultDASHminimumDASHcurvature 0 @c global.h:77 -@set src::default-output-filename a.tif +@set srcCOLONCOLONdefaultDASHoutputDASHfilename a.tif @c enfuse.cc:120 -@set src::default-soft-mask-template softmask-%n.tif +@set srcCOLONCOLONdefaultDASHsoftDASHmaskDASHtemplate softmask-%n.tif @c global.h:152 -@set src::default-tiff-resolution 300@dmn{dpi} +@set srcCOLONCOLONdefaultDASHtiffDASHresolution 300@dmn{dpi} @c enfuse.cc:81 -@set src::default-verbosity-level 1 +@set srcCOLONCOLONdefaultDASHverbosityDASHlevel 1 @c enfuse.cc:99 -@set src::default-weight-contrast 0.0 +@set srcCOLONCOLONdefaultDASHweightDASHcontrast 0.0 @c enfuse.cc:101 -@set src::default-weight-entropy 0.0 +@set srcCOLONCOLONdefaultDASHweightDASHentropy 0.0 @c enfuse.cc:94 -@set src::default-weight-exposure 1.0 +@set srcCOLONCOLONdefaultDASHweightDASHexposure 1.0 @c enfuse.cc:100 -@set src::default-weight-saturation 0.2 +@set srcCOLONCOLONdefaultDASHweightDASHsaturation 0.2 @c enfuse.cc:1689 -@set src::layer-selector all-layers +@set srcCOLONCOLONlayerDASHselector all-layers @c common.h:122 -@set src::mark-frozen-point cross +@set srcCOLONCOLONmarkDASHfrozenDASHpoint cross @c common.h:118 -@set src::mark-movable-point diamond +@set srcCOLONCOLONmarkDASHmovableDASHpoint diamond @c enfuse.cc:1314 -@set src::maximum-exposure-mu 1 +@set srcCOLONCOLONmaximumDASHexposureDASHmu 1 @c common.h:56 -@set src::maximum-pyramid-levels 29 +@set srcCOLONCOLONmaximumDASHpyramidDASHlevels 29 @c enfuse.cc:1281 -@set src::maximum-weight-contrast 1 +@set srcCOLONCOLONmaximumDASHweightDASHcontrast 1 @c enfuse.cc:1343 -@set src::maximum-weight-entropy 1 +@set srcCOLONCOLONmaximumDASHweightDASHentropy 1 @c enfuse.cc:1265 -@set src::maximum-weight-exposure 1 +@set srcCOLONCOLONmaximumDASHweightDASHexposure 1 @c enfuse.cc:1297 -@set src::maximum-weight-saturation 1 +@set srcCOLONCOLONmaximumDASHweightDASHsaturation 1 @c enfuse.cc:1410 -@set src::minimum-cache-block-size 1@dmn{KB} +@set srcCOLONCOLONminimumDASHcacheDASHblockDASHsize 1@dmn{KB} @c enfuse.cc:1509 -@set src::minimum-cache-size 1@dmn{MB} +@set srcCOLONCOLONminimumDASHcacheDASHsize 1@dmn{MB} @c enfuse.cc:1370 -@set src::minimum-contrast-window-size 3 +@set srcCOLONCOLONminimumDASHcontrastDASHwindowDASHsize 3 @c enfuse.cc:1390 -@set src::minimum-entropy-window-size 3 +@set srcCOLONCOLONminimumDASHentropyDASHwindowDASHsize 3 @c enfuse.cc:1311 -@set src::minimum-exposure-mu 0 +@set srcCOLONCOLONminimumDASHexposureDASHmu 0 @c enfuse.cc:1327 -@set src::minimum-exposure-sigma 0 +@set srcCOLONCOLONminimumDASHexposureDASHsigma 0 @c bounds.h:120 -@set src::minimum-pyramid-levels 1 +@set srcCOLONCOLONminimumDASHpyramidDASHlevels 1 @c enfuse.cc:1357 -@set src::minimum-verbosity-level 0 +@set srcCOLONCOLONminimumDASHverbosityDASHlevel 0 @c enfuse.cc:1278 -@set src::minimum-weight-contrast 0 +@set srcCOLONCOLONminimumDASHweightDASHcontrast 0 @c enfuse.cc:1340 -@set src::minimum-weight-entropy 0 +@set srcCOLONCOLONminimumDASHweightDASHentropy 0 @c enfuse.cc:1262 -@set src::minimum-weight-exposure 0 +@set srcCOLONCOLONminimumDASHweightDASHexposure 0 @c enfuse.cc:1294 -@set src::minimum-weight-saturation 0 +@set srcCOLONCOLONminimumDASHweightDASHsaturation 0 @c common.h:128 -@set src::visualize-first-vertex-value-color medium green +@set srcCOLONCOLONvisualizeDASHfirstDASHvertexDASHvalueDASHcolor medium green @c common.h:120 -@set src::visualize-frozen-point bright white +@set srcCOLONCOLONvisualizeDASHfrozenDASHpoint bright white @c common.h:124 -@set src::visualize-initial-path-color dark yellow +@set srcCOLONCOLONvisualizeDASHinitialDASHpathDASHcolor dark yellow @c common.h:116 -@set src::visualize-movable-point light orange +@set srcCOLONCOLONvisualizeDASHmovableDASHpoint light orange @c common.h:130 -@set src::visualize-next-vertex-value-color light green +@set srcCOLONCOLONvisualizeDASHnextDASHvertexDASHvalueDASHcolor light green @c common.h:132 -@set src::visualize-no-overlap-value-color dark red +@set srcCOLONCOLONvisualizeDASHnoDASHoverlapDASHvalueDASHcolor dark red @c common.h:126 -@set src::visualize-short-path-value-color bright yellow +@set srcCOLONCOLONvisualizeDASHshortDASHpathDASHvalueDASHcolor bright yellow @c common.h:134 -@set src::visualize-state-space-color dark blue +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHcolor dark blue @c common.h:136 -@set src::visualize-state-space-inside-color bright cyan +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHinsideDASHcolor bright cyan @c common.h:138 -@set src::visualize-state-space-unconverged-color bright magenta +@set srcCOLONCOLONvisualizeDASHstateDASHspaceDASHunconvergedDASHcolor bright magenta -- 1.7.10.4 debian/patches/0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch0000644000000000000000000002244412270704616023016 0ustar From 53812d0cd2fbb6cfafcaa16eb409c01c6392ef48 Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:12:42 +0100 Subject: [PATCH 4/9] Texinfo 5.1 workaround - macro on a separate line Texinfo breaks if macros using a conditional are placed in the middle of a line. (This is documented in Texinfo 5.1 reference but used to work.) Change texinfo source, although it adds unwanted whitespace in output. --- doc/bug-reports.texi | 4 +++- doc/enblend.texi | 28 +++++++++++++++++++++------- doc/enfuse.texi | 48 ++++++++++++++++++++++++++++++++++++------------ 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/doc/bug-reports.texi b/doc/bug-reports.texi index 250fc20..1290ef8 100644 --- a/doc/bug-reports.texi +++ b/doc/bug-reports.texi @@ -77,7 +77,9 @@ this by running it with the options @option{--version} and @item A complete set of input images that will reproduce the bug. Strive for a minimal set of @emph{small}@footnote{Images of a size less than -1500@classictimes{}1000 pixels qualify as small.} images. +1500@c +@classictimes{}@c +1000 pixels qualify as small.} images. @item The type of machine you are using, and the operating system name and diff --git a/doc/enblend.texi b/doc/enblend.texi index f825797..49e5120 100644 --- a/doc/enblend.texi +++ b/doc/enblend.texi @@ -510,7 +510,9 @@ original image, obviously defines the image at single-pixel scale, the first level works at two-pixel scale, and generally, the @math{n}-th level contains image data at @power{2, n}-pixel scale. This is the reason why an image of -@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be +@math{width}@c +@classictimes{}@c +@/@math{height}@dmn{pixels} cannot be deconstructed into a pyramid of more than @ifinfo @display @@ -1250,7 +1252,9 @@ Maximum finite value: @semilog{4.3, 9} @cindex canvas size @cindex size, canvas Ensure that the minimum ``canvas'' size of the output image is at -least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify +least @var{WIDTH}@c +@classictimes{}@c +@/@var{HEIGHT}. Optionally specify the @var{XOFFSET} and @var{YOFFSET}, too. @pindex nona @r{(Hugin)} @@ -1572,7 +1576,9 @@ If omitted @var{FACTOR} defaults to @value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}, this means, option@tie{}@option{--coarse-mask} shrinks the overlapping @emph{areas} by a factor of -@math{@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@classictimes{}@/@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}}. +@math{@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}@c +@classictimes{}@c +@/@value{srcCOLONCOLONdefaultDASHcoarsenessDASHfactor}}. With @var{FACTOR}@tie{}=@tie{}8 the total memory allocated during a run of Enblend shrinks approximately by 80% and the maximum amount of memory in use at a time is decreased to 60% (Enblend compiled with @@ -2494,7 +2500,9 @@ option@tie{}@option{--visualize} to directly judge the effect. When using this option in conjunction with option@tie{}@code{--coarse-mask}=@/@var{FACTOR}, keep in mind that the smoothing occurs @emph{after} the overlap regions have been shrunken. -Thus, blurring affects a @var{FACTOR}@classictimes{}@/@var{FACTOR} +Thus, blurring affects a @var{FACTOR}@c +@classictimes{}@c +@/@var{FACTOR} times larger area in the original images. Valid range: @var{RADIUS} @geq{} @value{srcCOLONCOLONminimumDASHsmoothDASHdifference}. @@ -2606,7 +2614,9 @@ of the image and the final seam-line @rimage{seam-line-visualization} @caption{Seam-line visualization of a simple overlap. The -853@classictimes{}238@dmn{pixel} image is shown at a magification of +853@c +@classictimes{}@c +238@dmn{pixel} image is shown at a magification of 100%.} @shortcaption{Seam-line visualization} @@ -2618,7 +2628,9 @@ of the image and the final seam-line @rimage{seam-line-visualization, 15cm} @caption{Seam-line visualization of a simple overlap. The -853@classictimes{}238@dmn{pixel} image has been rescaled to a width of +853@c +@classictimes{}@c +238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} @shortcaption{Seam-line visualization} @@ -2629,7 +2641,9 @@ approximately 15@dmn{cm}.} @float Figure,Figure:seam-line-visualization @rimage{seam-line-visualization, 15cm} -@caption{Seam-line visualization of a simple overlap. The 853@classictimes{}238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} +@caption{Seam-line visualization of a simple overlap. The 853@c +@classictimes{}@c +238@dmn{pixel} image has been rescaled to a width of approximately 15@dmn{cm}.} @shortcaption{Seam-line visualization} @end float diff --git a/doc/enfuse.texi b/doc/enfuse.texi index d04b9f5..483bc4f 100644 --- a/doc/enfuse.texi +++ b/doc/enfuse.texi @@ -623,7 +623,9 @@ original image, obviously defines the image at single-pixel scale, the first level works at two-pixel scale, and generally, the @math{n}-th level contains image data at @power{2, n}-pixel scale. This is the reason why an image of -@math{width}@classictimes{}@/@math{height}@dmn{pixels} cannot be +@math{width}@c +@classictimes{}@c +@/@math{height}@dmn{pixels} cannot be deconstructed into a pyramid of more than @ifinfo @display @@ -1311,7 +1313,9 @@ Maximum finite value: @semilog{4.3, 9} @cindex canvas size @cindex size, canvas Ensure that the minimum ``canvas'' size of the output image is at -least @var{WIDTH}@classictimes{}@/@var{HEIGHT}. Optionally specify +least @var{WIDTH}@c +@classictimes{}@c +@/@var{HEIGHT}. Optionally specify the @var{XOFFSET} and @var{YOFFSET}, too. @pindex nona @r{(Hugin)} @@ -1501,8 +1505,12 @@ A positive @var{LCE-SCALE} turns on local contrast enhancement @var{LCE-SCALE} is the radius of the Gaussian used in the enhancement step, @var{LCE-FACTOR} is the weight factor (``strength''). -@var{enhanced} = (1 + @var{LCE-FACTOR}) @classictimes{} @var{original} -@minus{} @var{LCE-FACTOR} @classictimes{} Gaussian@/Smooth(@var{original}, +@var{enhanced} = (1 + @var{LCE-FACTOR}) @c +@classictimes{}@c + @var{original} +@minus{} @var{LCE-FACTOR} @c +@classictimes{}@c + Gaussian@/Smooth(@var{original}, @var{LCE-SCALE}). @var{LCE-SCALE} defaults to @value{srcCOLONCOLONdefaultDASHlceDASHscale} pixels and @@ -1531,7 +1539,9 @@ left unchanged. This effectively suppresses weak edges. @opindex --contrast-window-size Set the window @var{SIZE} for local contrast analysis. The window -will be a square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. If +will be a square of @var{SIZE}@c +@classictimes{}@c +@/@var{SIZE} pixels. If given an even @var{SIZE}, Enfuse will automatically use the next odd number. @@ -1585,7 +1595,9 @@ output image. @opindex --entropy-window-size Window @var{SIZE} for local entropy analysis. The window will be a -square of @var{SIZE}@classictimes{}@/@var{SIZE} pixels. +square of @var{SIZE}@c +@classictimes{}@c +@/@var{SIZE} pixels. In the entropy calculation @var{SIZE} values of 3 to 7 yield an acceptable compromise of the locality of the information and the @@ -4656,10 +4668,14 @@ Experience has shown that neither the parameters @var{EDGESCALE} and @var{CURVATURE} nor the mode of operation (@acronym{SDev}-only, @acronym{LoG}-only, or a blend of both) scales to different image sizes. In practice, this means that if you start with a set of -reduced size images, say 2808@classictimes{}1872 pixels, carefully +reduced size images, say 2808@c +@classictimes{}@c +1872 pixels, carefully optimize @var{EDGESCALE}, @var{CURVATURE} and so on, and find @acronym{LoG}-only the best mode, and then switch to the original -resolution of 5616@classictimes{}3744 pixels, multiplying (or +resolution of 5616@c +@classictimes{}@c +3744 pixels, multiplying (or dividing) the parameters by four and sticking to @acronym{LoG}-only might @emph{not} result in the best fused image. For best quality, perform the parameter optimization and the search for the most @@ -5080,9 +5096,13 @@ centers around the image effects. Images should align well to be suitable for fusion. However, there is no hard mathematical rule what ``well'' means. The alignment requirements for 16@dmn{MPixel} images to yield a sharp -4"@classictimes{}6" print at 300@dmn{dpi} (``dpi'' means dots per +4"@c +@classictimes{}@c +6" print at 300@dmn{dpi} (``dpi'' means dots per inch) or even for web presentation are relatively low, whereas the -alignment of 8@dmn{MPixel} images for a 12"@classictimes{}18" print +alignment of 8@dmn{MPixel} images for a 12"@c +@classictimes{}@c +18" print ought to be tight. @pindex hugin @@ -5548,7 +5568,9 @@ next section. Let us use an example to illustrate the problem of relating the sharpness with the local contrast variations. Say we use a -5@classictimes{}5 contrast window. Moreover, let @code{sharp_edge} +5@c +@classictimes{}@c +5 contrast window. Moreover, let @code{sharp_edge} and @code{smooth_edge} be two specific configurations: @example @@ -5727,7 +5749,9 @@ Use @acronym{LoG} to detect edges on a scale of 0.3@dmn{pixels}. Apply the default grayscale projector: @code{average} and throw away all edges with a curvature of less than 0.5% and replace the @acronym{LoG} data between 0% and 0.5% with @acronym{SDev} data. Use -a window of 7@classictimes{}7@dmn{pixel} window to compute the +a window of 7@c +@classictimes{}@c +7@dmn{pixel} window to compute the @acronym{SDev}. @end table -- 1.7.10.4 debian/patches/0003-Texinfo-5.1-workaround-disable-some-macros.patch0000644000000000000000000000341712270704616022162 0ustar From 32f8585212aea7cba36aa98df7b8c8715f2579fa Mon Sep 17 00:00:00 2001 From: Andreas Metzler Date: Sun, 27 Oct 2013 08:05:34 +0100 Subject: [PATCH 3/9] Texinfo 5.1 workaround - disable some macros Origin: vendor --- doc/auxmac.texi | 64 +++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/doc/auxmac.texi b/doc/auxmac.texi index 98c679f..c416eac 100644 --- a/doc/auxmac.texi +++ b/doc/auxmac.texi @@ -113,38 +113,38 @@ x@c gobble following newline -- The Tricks of a Texinfo Wizard. @end macro -@c Required for older versions of makeinfo. The definition of @geq -@c for TeX lives in auxmac.tex. -@ifnottex -@macro geq -@ifinfo ->=@c -@end ifinfo -@html -≥ -@end html -@docbook -≥ -@end docbook -@end macro -@end ifnottex - - -@c Required for older versions of makeinfo. The definition of @leq -@c for TeX lives in auxmac.tex. -@ifnottex -@macro leq -@ifinfo -<=@c -@end ifinfo -@html -≤ -@end html -@docbook -≤ -@end docbook -@end macro -@end ifnottex +@c %%%%@c Required for older versions of makeinfo. The definition of @geq +@c %%%%@c for TeX lives in auxmac.tex. +@c %%%%@ifnottex +@c %%%%@macro geq +@c %%%%@ifinfo +@c %%%%>=@c +@c %%%%@end ifinfo +@c %%%%@html +@c %%%%≥ +@c %%%%@end html +@c %%%%@docbook +@c %%%%≥ +@c %%%%@end docbook +@c %%%%@end macro +@c %%%%@end ifnottex +@c %%%% +@c %%%% +@c %%%%@c Required for older versions of makeinfo. The definition of @leq +@c %%%%@c for TeX lives in auxmac.tex. +@c %%%%@ifnottex +@c %%%%@macro leq +@c %%%%@ifinfo +@c %%%%<=@c +@c %%%%@end ifinfo +@c %%%%@html +@c %%%%≤ +@c %%%%@end html +@c %%%%@docbook +@c %%%%≤ +@c %%%%@end docbook +@c %%%%@end macro +@c %%%%@end ifnottex @macro plusminus -- 1.7.10.4 debian/patches/series0000644000000000000000000000071312270704616012040 0ustar 0001-Change-all-texinfo-variable-names-to-alpha-nums.patch 0002-expand-homepage-macro.patch 0003-Texinfo-5.1-workaround-disable-some-macros.patch 0004-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0005-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0006-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0007-Leave-TEXINPUTS-alone.patch 0008-Texinfo-5.1-workaround-macro-on-a-separate-line.patch 0009-Texinfo-5.1-workaround-equationW.patch debian/control0000644000000000000000000000623112270704616010600 0ustar Source: enblend-enfuse Section: graphics Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian PhotoTools Maintainers Uploaders: Sebastian Harl , Andreas Metzler Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1), autotools-dev, libtiff-dev, libboost-dev, libboost-filesystem-dev, liblcms2-dev, libglew-dev, freeglut3-dev, libplot-dev, zlib1g-dev, libjpeg-dev, libpng12-dev, libopenexr-dev, pkg-config, help2man, perl, texinfo, texlive, texlive-generic-recommended, gnuplot, transfig, ghostscript, tidy, ttf-freefont,imagemagick, libxml2-utils, libvigraimpex-dev (>= 1.8.0+dfsg-2), libgsl0-dev Standards-Version: 3.9.5 Homepage: http://enblend.sourceforge.net/ Vcs-Git: git://anonscm.debian.org/pkg-phototools/enblend.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-phototools/enblend.git Package: enblend Architecture: any Depends: ${shlibs:Depends},${misc:Depends} Recommends: hugin Enhances: hugin Description: image blending tool Enblend is a tool for compositing images. Given a set of images that overlap in some irregular way, Enblend overlays them in such a way that the seam between the images is invisible, or at least very difficult to see. It can, for example, be used to blend a panorama composed of several images. . It uses a Burt & Adelson multi-resolution spline. This technique tries to make the seams between the input images invisible. The basic idea is that image features should be blended across a transition zone proportional in size to the spatial frequency of the features. For example, objects like trees and windowpanes have rapid changes in color. By blending these features in a narrow zone, you will not be able to see the seam because the eye already expects to see color changes at the edge of these features. Clouds and sky are the opposite. These features have to be blended across a wide transition zone because any sudden change in color will be immediately noticeable. . Enblend does not align images for you. Use a tool like Hugin or PanoTools to do this. The TIFFs produced by these programs are exactly what Enblend is designed to work with. Package: enfuse Architecture: any Depends: ${shlibs:Depends},${misc:Depends} Recommends: hugin Enhances: hugin Description: image exposure blending tool Enfuse blends differently exposed images of the same scene into a nice output image, without producing intermediate HDR images that are then tonemapped to a viewable image. This simplified process often works much better and quicker than the currently known tonemapping algorithms. . The exposure blending is done using the Mertens-Kautz-Van Reeth exposure fusion algorithm. The basic idea is that pixels in the input images are weighted according to qualities such as proper exposure, good contrast, and high saturation. These weights determine how much a given pixel will contribute to the final image. . Enfuse does not align images for you. Use a tool like Hugin or PanoTools to do this. The TIFFs produced by these programs are exactly what Enfuse is designed to work with. debian/rules0000755000000000000000000000713612270705143010256 0ustar #!/usr/bin/make -f # debian/rules for enblend-enfuse # # Written by Sebastian Harl . # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) ifneq (,$(findstring arm,$(DEB_HOST_GNU_TYPE))) export DEB_CFLAGS_MAINT_STRIP = -O2 export DEB_CXXFLAGS_MAINT_STRIP = -O2 export DEB_CFLAGS_MAINT_APPEND = -O1 export DEB_CXXFLAGS_MAINT_APPEND = -O1 endif endif CONFARGS=--host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ $(shell env DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed \ dpkg-buildflags --export=configure) \ --prefix=/usr --mandir=\$${prefix}/share/man \ --enable-gpu-support=yes \ --with-boost-filesystem=yes \ --with-openexr=yes # --disable-openmp \ # --enable-image-cache=yes \ get-orig-source: dh_testdir dh_testroot chmod 755 debian/bin/uscan_repack.sh uscan --verbose --force-download --rename # Hack: Since out of tree building of documentation is broken, make a out-tree # build for mp versions and in-tree build for the regular binaries. Out of tree # configure fails if in-tree configure run is detected, therefore force correct # ordering by making config.status depend on build-tree-mp/config.status. config.status: configure build-tree-mp/config.status dh_testdir ./configure $(CONFARGS) \ --disable-openmp \ --enable-image-cache=yes build-tree-mp/config.status: configure dh_testdir rm -vf config.guess config.sub ln -s /usr/share/misc/config.sub /usr/share/misc/config.guess . if ! test -e build-tree-mp ; then mkdir build-tree-mp ; fi cd build-tree-mp && ../configure $(CONFARGS) \ --enable-openmp \ --disable-image-cache build-indep: # nothing to do build-arch: build-arch-stamp build: build-arch-stamp build-arch-stamp: config.status build-tree-mp/config.status dh_testdir cd build-tree-mp && $(MAKE) $(MAKE) $(MAKE) pdf sed -e "s/manual page for enblend.*/combine images using a multiresolution spline/" \ src/enblend.1 > src/enblend.1.tmp mv src/enblend.1.tmp src/enblend.1 sed -e "s/manual page for enfuse.*/poor man's HDR/" \ src/enfuse.1 > src/enfuse.1.tmp mv src/enfuse.1.tmp src/enfuse.1 touch build-arch-stamp clean: dh_testdir dh_testroot rm -f build-arch-stamp [ ! -f Makefile ] || $(MAKE) distclean rm -f doc/*.info doc/enblend.tpt doc/enfuse.tpt rm -rf build-tree-mp rm -vf config.guess config.sub dh_clean install: build-arch-stamp dh_testdir dh_testroot dh_prep dh_installdirs $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install rm -f $(CURDIR)/debian/tmp/usr/share/info/dir install -m755 build-tree-mp/src/enblend \ $(CURDIR)/debian/tmp/usr/bin/enblend-mp install -m755 build-tree-mp/src/enfuse \ $(CURDIR)/debian/tmp/usr/bin/enfuse-mp binary-indep: # nothing to do here binary-arch: build install dh_testdir dh_testroot dh_installchangelogs -a ChangeLog dh_installdocs -A -a NEWS AUTHORS dh_installexamples -a dh_install -a --sourcedir=debian/tmp --fail-missing dh_installman -a dh_installinfo -penblend doc/enblend.info dh_installinfo -penfuse doc/enfuse*.info dh_link -a dh_strip -a dh_compress -a -X.pdf dh_fixperms -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: get-orig-source build clean binary-indep binary-arch binary install build-arch build-indep debian/source/0000755000000000000000000000000012270704616010473 5ustar debian/source/format0000644000000000000000000000001412270704616011701 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000022012270704616010216 0ustar version=3 opts=dversionmangle=s/\+dfsg$// \ http://sf.net/enblend/enblend(?:-enfuse)?-([0-9.]+)\.tar\.gz \ debian debian/bin/uscan_repack.sh