Hello community,
here is the log from the commit of package ufraw
checked in at Sun Aug 6 22:19:25 CEST 2006.
--------
--- ufraw/ufraw.changes 2006-08-02 12:30:51.000000000 +0200
+++ ufraw/ufraw.changes 2006-08-04 13:02:05.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Aug 4 13:00:32 CEST 2006 - postadal@suse.cz
+
+- updated to version 0.9
+ * add darkframe subtraction option
+ * more conservative highlight unclipping
+ * support filenames in URI format
+
+-------------------------------------------------------------------
Old:
----
ufraw-0.8.120060802.tar.bz2
New:
----
ufraw-0.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ufraw.spec ++++++
--- /var/tmp/diff_new_pack.qqS43f/_old 2006-08-06 22:19:12.000000000 +0200
+++ /var/tmp/diff_new_pack.qqS43f/_new 2006-08-06 22:19:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ufraw (Version 0.8.120060802 )
+# spec file for package ufraw (Version 0.9 )
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,9 +24,9 @@
Enhances: gimp-2.0
Suggests: dcraw-gnome
%endif
-Version: 0.8.120060802
+Version: 0.9
Release: 1
-%define vversion 0.8.1
+%define vversion 0.9
Summary: The Unidentified Flying Raw
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-desktop.patch
@@ -63,7 +63,7 @@
Udi Fuchs UdiFuchs@gmail.com
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
%patch
%build
@@ -104,6 +104,11 @@
%_gimpplugindir/plug-ins/
%changelog -n ufraw
+* Fri Aug 04 2006 - postadal@suse.cz
+- updated to version 0.9
+ * add darkframe subtraction option
+ * more conservative highlight unclipping
+ * support filenames in URI format
* Wed Aug 02 2006 - postadal@suse.cz
- updated from cvs
* fixed zoom support (WB ...)
++++++ ufraw-0.8.120060802.tar.bz2 -> ufraw-0.9.tar.bz2 ++++++
++++ 16268 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/README new/ufraw-0.9/README
--- old/ufraw/README 2006-08-02 11:37:00.000000000 +0200
+++ new/ufraw-0.9/README 2006-08-01 22:48:07.000000000 +0200
@@ -43,16 +43,12 @@
If some of the lines end with 'no' instead of 'yes', it is not the end of
the world. It only means that this option in UFRaw will be disabled. EXIF
-support is disabled by default. It can be enabled for Nikon NEF, Pentax
-PEF and Fuji RAF files by running configure as:
-./configure --with-libexif
-
-The libexif development package is required for this to work.
-You should use libexif-0.6.13 or newer.
-
-To enable EXIF support for Canon CRW files use (requires the exiv2
-development package):
-./configure --with-exiv2
+support is disabled by default. It can be enabled for Canon (CRW, CR2),
+Nikon (NEF), Pentax (PEF), Samsung (PEF), Sony (SR2, ARW) and Adobe's DNG
+by running configure as:
+./configure --with-exiv2 (requires exiv2-0.10 or newer)
+and for Fuji (RAF) by:
+./configure --with-libexif (requires libexif-0.6.13 or newer)
These paragraphs use the term "development package"; the general
requirement is to have the full library installed, including header
@@ -189,12 +185,6 @@
stages of the development versions. If you use the development version you
might have to delete or fix manually such files from time to time.
-Reading EXIF data is only supported for NEF and PEF files - which are really
-big-endian TIFF files - and even then your mileage may vary. In the worst
-case UFRaw may crash and in the best case it will read some, but not all of
-the data. Reading EXIF data from CR2 files - which are little-endian TIFF
-files - is currently not supported.
-
Last but not least, the development version is poorly tested and has some
half written features, therefore it is bound to have bugs...
@@ -222,6 +212,14 @@
History
=======
+
+xx/08/2006 - UFRaw-0.9 released, based on DCRaw v8.28.
+* Display EXIF data in user interface.
+* Add darkframe subtraction option.
+* More conservative highlight unclipping.
+* Support filenames in URI format.
+* Some bug corrections.
+
13/05/2006 - UFRaw-0.8.1 released, based on DCRaw v8.15.
* Fix Gimp plug-in half-interpolation crash.
* Fix possible crash in auto-exposure.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/TODO new/ufraw-0.9/TODO
--- old/ufraw/TODO 2006-08-02 11:37:00.000000000 +0200
+++ new/ufraw-0.9/TODO 2006-08-01 22:49:55.000000000 +0200
@@ -6,12 +6,10 @@
Leaf embedded profiles
fuji sqrt(0.5) factor in size
Canon 10D presets from ExifTool
-support URI
window size
g_fopen - UTF-8
-Read RAW preview image (parse.c)
+Read RAW preview image
Use bilateral filtering for noise reduction
-Better EXIF support
Show WB spot/area values in HSV (in addition to output colorspace pixels).
Show WB spot/area values in Adam's exposure zones somehow.
Bug: when show overexposure is checked, WB spot counts blown out as 0.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/compile new/ufraw-0.9/compile
--- old/ufraw/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/ufraw-0.9/compile 2006-05-13 19:23:41.000000000 +0200
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# 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, 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/config.h.in new/ufraw-0.9/config.h.in
--- old/ufraw/config.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/ufraw-0.9/config.h.in 2006-06-05 16:37:28.000000000 +0200
@@ -0,0 +1,97 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* disable deprecated gdk features */
+#undef GDK_DISABLE_DEPRECATED
+
+/* disable deprecated gtk+ features */
+#undef GTK_DISABLE_DEPRECATED
+
+/* disable deprecated glib features */
+#undef G_DISABLE_DEPRECATED
+
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+#undef HAVE_CANONICALIZE_FILE_NAME
+
+/* have exiv2 */
+#undef HAVE_EXIV2
+
+/* have atleast version 2.6 of gtk+ */
+#undef HAVE_GTK_2_6
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* have libexif */
+#undef HAVE_LIBEXIF
+
+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
+#undef HAVE_LIBJPEG
+
+/* Define to 1 if you have the `tiff' library (-ltiff). */
+#undef HAVE_LIBTIFF
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the `memmem' function. */
+#undef HAVE_MEMMEM
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of a `double', as computed by sizeof. */
+#undef SIZEOF_DOUBLE
+
+/* The size of a `float', as computed by sizeof. */
+#undef SIZEOF_FLOAT
+
+/* The size of a `int', as computed by sizeof. */
+#undef SIZEOF_INT
+
+/* The size of a `short', as computed by sizeof. */
+#undef SIZEOF_SHORT
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/missing new/ufraw-0.9/missing
--- old/ufraw/missing 1970-01-01 01:00:00.000000000 +0100
+++ new/ufraw-0.9/missing 2006-05-13 19:23:36.000000000 +0200
@@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
+
+# 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, 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
+ ;;
+
+ -*)
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+ ;;
+
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case "$f" in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison|yacc)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f y.tab.h ]; then
+ echo >y.tab.h
+ fi
+ if [ ! -f y.tab.c ]; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex|flex)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if [ $# -ne 1 ]; then
+ eval LASTARG="\${$#}"
+ case "$LASTARG" in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if [ -f "$SRCFILE" ]; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if [ ! -f lex.yy.c ]; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
+ makeinfo)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ tar)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/patch2 new/ufraw-0.9/patch2
--- old/ufraw/patch2 2006-03-29 14:38:00.000000000 +0200
+++ new/ufraw-0.9/patch2 1970-01-01 01:00:00.000000000 +0100
@@ -1,462 +0,0 @@
-? patch2
-Index: TODO
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/TODO,v
-retrieving revision 1.18
-retrieving revision 1.17
-diff -u -r1.18 -r1.17
---- TODO 29 Mar 2006 05:23:30 -0000 1.18
-+++ TODO 3 Mar 2006 21:11:39 -0000 1.17
-@@ -1,4 +1,4 @@
--For UFRaw-0.8
-+For UFRaw-0.7
- =============
-
- For the future
-Index: dcraw.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/dcraw.c,v
-retrieving revision 1.66
-retrieving revision 1.65
-diff -u -r1.66 -r1.65
---- dcraw.c 29 Mar 2006 05:22:28 -0000 1.66
-+++ dcraw.c 25 Mar 2006 04:16:39 -0000 1.65
-@@ -19,8 +19,8 @@
- copy them from an earlier, non-GPL Revision of dcraw.c, or (c)
- purchase a license from the author.
-
-- $Revision: 1.320 $
-- $Date: 2006/03/29 02:44:05 $
-+ $Revision: 1.319 $
-+ $Date: 2006/03/24 07:03:04 $
- */
-
- #define _GNU_SOURCE
-@@ -3898,11 +3898,8 @@
- case 46275:
- strcpy (make, "Imacon");
- data_offset = ftell(ifp);
-- break;
-- case 46279:
-- fseek (ifp, 78, SEEK_CUR);
-- raw_width = get4();
-- raw_height = get4();
-+ raw_width = 4090;
-+ raw_height = len / raw_width / 2;
- break;
- case 50454: /* Sinar tag */
- case 50455:
-@@ -5571,14 +5568,12 @@
- model[0] = 0;
- }
- } else if (!strcmp(make,"Imacon")) {
-+ height = raw_height - 6;
-+ width = raw_width - 10;
-+ data_offset += 6 + raw_width*12;
-+ flip = height > width+10 ? 5:3;
- sprintf (model, "Ixpress %d-Mp", height*width/1000000);
-- if (raw_width < 4096) {
-- data_offset += 6 + raw_width*12;
-- height = raw_height - 6;
-- width = raw_width - 10;
-- filters = 0x61616161;
-- flip = height > width+10 ? 5:3;
-- }
-+ filters = 0x61616161;
- load_raw = unpacked_load_raw;
- maximum = 0xffff;
- pre_mul[0] = 1.963;
-@@ -6182,7 +6177,7 @@
- if (argc == 1)
- {
- fprintf (stderr,
-- "\nRaw Photo Decoder \"dcraw\" v8.10"
-+ "\nRaw Photo Decoder \"dcraw\" v8.09"
- "\nby Dave Coffin, dcoffin a cybercom o net"
- "\n\nUsage: %s [options] file1 file2 ...\n"
- "\nValid options:"
-Index: dcraw_api.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/dcraw_api.c,v
-retrieving revision 1.38
-retrieving revision 1.37
-diff -u -r1.38 -r1.37
---- dcraw_api.c 28 Mar 2006 22:03:28 -0000 1.38
-+++ dcraw_api.c 25 Mar 2006 18:40:31 -0000 1.37
-@@ -398,7 +398,7 @@
- if (interpolation==dcraw_ahd_interpolation && h->colors > 3)
- interpolation = dcraw_vng_interpolation;
- f4 = h->fourColorFilters;
-- if (h->colors==3) rgbWB[3] = rgbWB[1];
-+ if (rgbWB[3]==0) rgbWB[3] = rgbWB[1];
- for(r=0; r<h->height; r++)
- for(c=0; c<h->width; c++)
- f->image[r*f->width+c][FC(ff,r,c)] = MIN( MAX( (gint64)
-Index: nikon_curve.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/nikon_curve.c,v
-retrieving revision 1.13
-retrieving revision 1.12
-diff -u -r1.13 -r1.12
---- nikon_curve.c 28 Mar 2006 22:48:33 -0000 1.13
-+++ nikon_curve.c 11 Mar 2006 15:47:46 -0000 1.12
-@@ -28,7 +28,6 @@
- #include "ufraw.h"
- #else
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
-- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #endif
-
- /*************************************************
-@@ -942,7 +941,7 @@
- **********************************************/
- int CurveDataSample(CurveData *curve, CurveSample *sample)
- {
-- int i = 0, n;
-+ unsigned int i = 0, n;
-
- double x[20];
- double y[20];
-@@ -966,7 +965,7 @@
- }
- else
- {
-- for(i = 0; i < curve->m_numAnchors; i++)
-+ for(i = 0; i < (unsigned int)curve->m_numAnchors; i++)
- {
- x[i] = curve->m_anchors[i].x*box_width + curve->m_min_x;
- y[i] = curve->m_anchors[i].y*box_height + curve->m_min_y;
-@@ -988,7 +987,7 @@
- double yppval = 0;
-
- //Now build a table
-- int val;
-+ double val = 0;
- double res = 1.0/(double)sample->m_samplingRes;
-
- //allocate enough space for the samples
-@@ -996,41 +995,46 @@
- sample->m_samplingRes*sizeof(int));
- DEBUG_PRINT("DEBUG: SAMPLING OUTPUT RANGE: 0 -> %u\n", sample->m_outputRes);
-
-- sample->m_Samples = (unsigned int *)realloc(sample->m_Samples,
-- sample->m_samplingRes * sizeof(int));
--
-- int firstPointX = curve->m_anchors[0].x * sample->m_samplingRes;
-- int firstPointY = pow(curve->m_anchors[0].y, gamma) *
-- sample->m_outputRes;
-- int lastPointX = curve->m_anchors[curve->m_numAnchors-1].x *
-- sample->m_samplingRes;
-- int lastPointY = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma) *
-- sample->m_outputRes;
-- int maxY = curve->m_max_y * sample->m_outputRes;
-- int minY = curve->m_min_y * sample->m_outputRes;
-+ //release old sample allocation if it exists
-+ if (sample->m_Samples!=NULL)
-+ {
-+ free(sample->m_Samples);
-+ }
-+ sample->m_Samples = (unsigned int *)calloc(sample->m_samplingRes, sizeof(int));
-
-- for(i = 0; i < (int)sample->m_samplingRes; i++)
-+ for(i = 0; i < sample->m_samplingRes; i++)
- {
- //get the value of the curve at a point
- //take into account that curves may not necessarily begin at x = 0.0
- //nor end at x = 1.0
-
- //Before the first point and after the last point, take a strait line
-- if (i < firstPointX) {
-- sample->m_Samples[i] = firstPointY;
-- } else if (i > lastPointX) {
-- sample->m_Samples[i] = lastPointY;
-+ if (i*res < curve->m_anchors[0].x) {
-+ val = pow(curve->m_anchors[0].y, gamma);
-+ } else if (i*res > curve->m_anchors[curve->m_numAnchors-1].x) {
-+ val = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma);
- } else {
- //within range, we can sample the curve
-- if (gamma==1.0)
-- val = spline_cubic_val( n, x, i*res, y,
-- ypp, &ypval, &yppval ) * sample->m_outputRes;
-- else
-- val = pow(spline_cubic_val( n, x, i*res, y,
-- ypp, &ypval, &yppval ), gamma) * sample->m_outputRes;
-+ val = spline_cubic_val ( n, x, i*res, y,
-+ ypp, &ypval, &yppval );
-
-- sample->m_Samples[i] = MIN(MAX(val,minY),maxY);
-+ //Compensate for gamma.
-+ val = pow(val,gamma);
-+
-+ //cap at the high end of the range
-+ if (val > curve->m_max_y)
-+ {
-+ val = curve->m_max_y;
-+ }
-+ //cap at the low end of the range
-+ else if (val < curve->m_min_y)
-+ {
-+ val = curve->m_min_y;
-+ }
- }
-+
-+ //save the sample
-+ sample->m_Samples[i] = (unsigned int)floor(val*sample->m_outputRes);
- }
-
- free(ypp);
-Index: ufraw_conf.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
-retrieving revision 1.25
-retrieving revision 1.24
-diff -u -r1.25 -r1.24
---- ufraw_conf.c 28 Mar 2006 22:03:28 -0000 1.25
-+++ ufraw_conf.c 9 Mar 2006 21:54:01 -0000 1.24
-@@ -442,8 +442,6 @@
- g_free(utf8);
- }
- if (!strcmp("Intent", element)) sscanf(temp, "%d", &c->intent);
-- if (!strcmp("Make", element)) g_strlcpy(c->make, temp, max_name);
-- if (!strcmp("Model", element)) g_strlcpy(c->model, temp, max_name);
- if (!strcmp("ProfilePath", element)) {
- char *utf8 = g_filename_from_utf8(temp, -1, NULL, NULL, NULL);
- if (utf8!=NULL)
-@@ -880,10 +878,6 @@
- dst->temperature = src->temperature;
- dst->green = src->green;
- for (i=0; i<4; i++) dst->chanMul[i] = src->chanMul[i];
-- /* make and model are 'part of' ChanMul,
-- * since on different make and model ChanMul are meaningless */
-- g_strlcpy(dst->make, src->make, max_name);
-- g_strlcpy(dst->model, src->model, max_name);
- dst->exposure = src->exposure;
- dst->saturation = src->saturation;
- dst->black = src->black;
-Index: ufraw_ufraw.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
-retrieving revision 1.41
-retrieving revision 1.39
-diff -u -r1.41 -r1.39
---- ufraw_ufraw.c 29 Mar 2006 05:23:30 -0000 1.41
-+++ ufraw_ufraw.c 25 Mar 2006 18:40:31 -0000 1.39
-@@ -179,7 +179,6 @@
- {
- dcraw_data *raw=NULL;
- int status;
-- gboolean loadingID = FALSE;
-
- if (strcmp(rc->wb, spot_wb)) rc->chanMul[0] = -1.0;
- if (rc->autoExposure==enabled_state) rc->autoExposure = apply_state;
-@@ -188,7 +187,6 @@
- /* Check if we are loading an ID file */
- if (uf!=NULL) {
- if (uf->conf!=NULL) {
-- loadingID = TRUE;
- conf_data tmp = *rc;
- conf_copy_image(&tmp, uf->conf);
- conf_copy_save(&tmp, uf->conf);
-@@ -227,9 +225,8 @@
-
- /* If we switched cameras, ignore channel multipliers and
- * change spot_wb to manual_wb */
-- if ( !loadingID &&
-- ( strcmp(uf->conf->make, raw->make)!=0 ||
-- strcmp(uf->conf->model, raw->model)!=0 ) ) {
-+ if (strcmp(uf->conf->make, raw->make)!=0 ||
-+ strcmp(uf->conf->model, raw->model)!=0) {
- uf->conf->chanMul[0] = -1.0;
- if (strcmp(uf->conf->wb, spot_wb)==0)
- g_strlcpy(uf->conf->wb, manual_wb, max_name);
-@@ -239,7 +236,7 @@
- /* For MinG32 we don't have the thread safe ctime_r */
- g_strlcpy(uf->conf->timestamp, ctime(&raw->timestamp), max_name);
- #elifdef SOLARIS
-- ctime_r(&raw->timestamp, uf->conf->timestamp, sizeof(uf->conf->timestamp));
-+ ctime_r(&raw->timestamp, uf->conf->timestamp,sizeof(uf->conf->timestamp));
- #else
- ctime_r(&raw->timestamp, uf->conf->timestamp);
- #endif
-Index: wb_presets.c
-===================================================================
-RCS file: /cvsroot/ufraw/ufraw/wb_presets.c,v
-retrieving revision 1.7
-retrieving revision 1.6
-diff -u -r1.7 -r1.6
---- wb_presets.c 28 Mar 2006 22:48:33 -0000 1.7
-+++ wb_presets.c 5 Mar 2006 23:56:56 -0000 1.6
-@@ -393,170 +393,6 @@
- { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */
- { "NIKON", "D70", "Shade", 3, { 2.394531, 1, 1.375000, 0 } },
-
-- { "OLYMPUS", "C5060WZ", "Shade", 0, { 1.949219, 1, 1.195312, 0 } },
-- { "OLYMPUS", "C5060WZ", "Cloudy", 0, { 1.621094, 1, 1.410156, 0 } },
-- { "OLYMPUS", "C5060WZ", "Sunny", 0, { 1.511719, 1, 1.500000, 0 } },
-- { "OLYMPUS", "C5060WZ", "Evening", 0, { 1.636719, 1, 1.496094, 0 } },
-- { "OLYMPUS", "C5060WZ", "Fluorescent1", 0, { 1.734375, 1, 1.343750, 0 } },
-- { "OLYMPUS", "C5060WZ", "Fluorescent2", 0, { 1.457031, 1, 1.691406, 0 } },
-- { "OLYMPUS", "C5060WZ", "Fluorescent3", 0, { 1.417969, 1, 2.230469, 0 } },
-- { "OLYMPUS", "C5060WZ", "Fluorescent4", 0, { 1, 1.103448, 3.422414, 0 } },
-- { "OLYMPUS", "C5060WZ", "Incandescent", 0, { 1, 1.153153, 3.662162, 0 } },
-- { "OLYMPUS", "C5060WZ", "Flash/Auto", 0, { 1.850000, 1, 1.308044, 0 } },
--
-- // Olympus C8080WZ - firmware 757-78
-- { "OLYMPUS", "C8080WZ", "Shadows", -7, { 1.515625, 1.000000, 1.773438, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -6, { 1.671875, 1.000000, 1.691406, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -5, { 1.832031, 1.000000, 1.605469, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -4, { 1.988281, 1.000000, 1.523438, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -3, { 2.144531, 1.000000, 1.441406, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -2, { 2.300781, 1.000000, 1.355469, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", -1, { 2.457031, 1.000000, 1.273438, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 0, { 2.617188, 1.000000, 1.191406, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 1, { 2.929688, 1.000000, 1.117188, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 2, { 3.242188, 1.000000, 1.046875, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 3, { 3.644000, 1.024000, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 4, { 4.290043, 1.108225, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 5, { 5.032864, 1.201878, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 6, { 5.907692, 1.312821, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Shadows", 7, { 7.000000, 1.454545, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -7, { 1.277344, 1.000000, 2.164062, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -6, { 1.406250, 1.000000, 2.062500, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -5, { 1.539062, 1.000000, 1.960938, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -4, { 1.671875, 1.000000, 1.859375, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -3, { 1.804688, 1.000000, 1.757812, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -2, { 1.937500, 1.000000, 1.656250, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", -1, { 2.070312, 1.000000, 1.554688, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 0, { 2.203125, 1.000000, 1.453125, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 1, { 2.464844, 1.000000, 1.363281, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 2, { 2.730469, 1.000000, 1.277344, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 3, { 2.996094, 1.000000, 1.191406, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 4, { 3.257812, 1.000000, 1.101562, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 5, { 3.523438, 1.000000, 1.015625, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 6, { 4.075630, 1.075630, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Cloudy day", 7, { 4.823256, 1.190698, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -7, { 1.234375, 1.000000, 2.343750, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -6, { 1.359375, 1.000000, 2.234375, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -5, { 1.488281, 1.000000, 2.125000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -4, { 1.617188, 1.000000, 2.011719, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -3, { 1.742188, 1.000000, 1.902344, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -2, { 1.871094, 1.000000, 1.792969, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", -1, { 2.000000, 1.000000, 1.683594, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 0, { 2.128906, 1.000000, 1.574219, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 1, { 2.382812, 1.000000, 1.476562, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 2, { 2.636719, 1.000000, 1.382812, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 3, { 2.894531, 1.000000, 1.289062, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 4, { 3.148438, 1.000000, 1.195312, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 5, { 3.406250, 1.000000, 1.101562, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 6, { 3.660156, 1.000000, 1.003906, 0 } },
-- { "OLYMPUS", "C8080WZ", "Sunny day", 7, { 4.300429, 1.098712, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -7, { 1.308594, 1.000000, 2.199219, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -6, { 1.445312, 1.000000, 2.093750, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -5, { 1.582031, 1.000000, 1.992188, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -4, { 1.718750, 1.000000, 1.886719, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -3, { 1.851562, 1.000000, 1.785156, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -2, { 1.988281, 1.000000, 1.679688, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", -1, { 2.125000, 1.000000, 1.578125, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 0, { 2.261719, 1.000000, 1.476562, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 1, { 2.531250, 1.000000, 1.386719, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 2, { 2.800781, 1.000000, 1.296875, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 3, { 3.074219, 1.000000, 1.207031, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 4, { 3.343750, 1.000000, 1.121094, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 5, { 3.617188, 1.000000, 1.031250, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 6, { 4.128631, 1.062241, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Evening sunlight", 7, { 4.863014, 1.168950, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -7, { 1.488281, 1.000000, 2.214844, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -6, { 1.652344, 1.000000, 2.105469, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -5, { 1.812500, 1.000000, 1.992188, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -4, { 1.976562, 1.000000, 1.882812, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -3, { 2.117188, 1.000000, 1.773438, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -2, { 2.253906, 1.000000, 1.675781, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -1, { 2.425781, 1.000000, 1.585938, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 0, { 2.570312, 1.000000, 1.468750, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 1, { 2.890625, 1.000000, 1.386719, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 2, { 3.199219, 1.000000, 1.308594, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 3, { 3.500000, 1.000000, 1.214844, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 4, { 3.820312, 1.000000, 1.125000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 5, { 4.128906, 1.000000, 1.039062, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 6, { 4.711934, 1.053498, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 7, { 5.450450, 1.153153, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -7, { 1.425781, 1.000000, 2.097656, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -6, { 1.574219, 1.000000, 2.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -5, { 1.722656, 1.000000, 1.902344, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -4, { 1.867188, 1.000000, 1.804688, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -3, { 2.015625, 1.000000, 1.703125, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -2, { 2.164062, 1.000000, 1.605469, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -1, { 2.312500, 1.000000, 1.507812, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 0, { 2.460938, 1.000000, 1.410156, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 1, { 2.753906, 1.000000, 1.324219, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 2, { 3.050781, 1.000000, 1.238281, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 3, { 3.343750, 1.000000, 1.156250, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 4, { 3.640625, 1.000000, 1.070312, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 5, { 4.000000, 1.015873, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 6, { 4.688312, 1.108225, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 7, { 5.545455, 1.224880, 1.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -7, { 1.195312, 1.000000, 2.589844, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -6, { 1.316406, 1.000000, 2.464844, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -5, { 1.441406, 1.000000, 2.343750, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -4, { 1.566406, 1.000000, 2.222656, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -3, { 1.687500, 1.000000, 2.101562, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -2, { 1.812500, 1.000000, 1.980469, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -1, { 1.937500, 1.000000, 1.859375, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 0, { 2.062500, 1.000000, 1.738281, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 1, { 2.308594, 1.000000, 1.632812, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 2, { 2.554688, 1.000000, 1.527344, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 3, { 2.804688, 1.000000, 1.421875, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 4, { 3.050781, 1.000000, 1.320312, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 5, { 3.296875, 1.000000, 1.214844, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 6, { 3.546875, 1.000000, 1.109375, 0 } },
-- { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 7, { 3.792969, 1.000000, 1.007812, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -7, { 1.109375, 1.000000, 3.257812, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -6, { 1.226562, 1.000000, 3.105469, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -5, { 1.339844, 1.000000, 2.953125, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -4, { 1.457031, 1.000000, 2.796875, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -3, { 1.570312, 1.000000, 2.644531, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -2, { 1.687500, 1.000000, 2.492188, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -1, { 1.800781, 1.000000, 2.339844, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 0, { 1.917969, 1.000000, 2.187500, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 1, { 2.144531, 1.000000, 2.054688, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 2, { 2.375000, 1.000000, 1.921875, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 3, { 2.605469, 1.000000, 1.792969, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 4, { 2.835938, 1.000000, 1.660156, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 5, { 3.066406, 1.000000, 1.531250, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 6, { 3.296875, 1.000000, 1.398438, 0 } },
-- { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 7, { 3.527344, 1.000000, 1.265625, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -7, { 1.000000, 1.347368, 5.963158, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -6, { 1.000000, 1.224880, 5.167464, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -5, { 1.000000, 1.117904, 4.484716, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -4, { 1.000000, 1.028112, 3.911647, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -3, { 1.046875, 1.000000, 3.593750, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -2, { 1.125000, 1.000000, 3.386719, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -1, { 1.203125, 1.000000, 3.179688, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 0, { 1.281250, 1.000000, 2.972656, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 1, { 1.433594, 1.000000, 2.792969, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 2, { 1.585938, 1.000000, 2.613281, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 3, { 1.742188, 1.000000, 2.437500, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 4, { 1.894531, 1.000000, 2.257812, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 5, { 2.046875, 1.000000, 2.078125, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 6, { 2.203125, 1.000000, 1.902344, 0 } },
-- { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 7, { 2.355469, 1.000000, 1.722656, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -7, { 1.000000, 1.488372, 6.988372, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -6, { 1.000000, 1.347368, 6.026316, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -5, { 1.000000, 1.230769, 5.235577, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -4, { 1.000000, 1.132743, 4.566372, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -3, { 1.000000, 1.049180, 4.000000, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -2, { 1.023438, 1.000000, 3.589844, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", -1, { 1.093750, 1.000000, 3.371094, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 0, { 1.164062, 1.000000, 3.152344, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 1, { 1.300781, 1.000000, 2.960938, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 2, { 1.441406, 1.000000, 2.773438, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 3, { 1.582031, 1.000000, 2.582031, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 4, { 1.722656, 1.000000, 2.394531, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 5, { 1.722656, 1.000000, 2.394531, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 6, { 2.000000, 1.000000, 2.015625, 0 } },
-- { "OLYMPUS", "C8080WZ", "3000K Tungsten", 7, { 2.140625, 1.000000, 1.828125, 0 } },
--// Fin ajout
--
- { "OLYMPUS", "E-1", "3000K Tungsten", -7, { 1.015625, 1, 1.867188, 0 } },
- { "OLYMPUS", "E-1", "3000K Tungsten", -6, { 1.007812, 1, 1.875000, 0 } },
- { "OLYMPUS", "E-1", "3000K Tungsten", -5, { 1, 1, 1.890625, 0 } },
-
--
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ufraw/wb_extract.pl new/ufraw-0.9/wb_extract.pl
--- old/ufraw/wb_extract.pl 2006-06-26 18:40:17.000000000 +0200
+++ new/ufraw-0.9/wb_extract.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-if (@ARGV < 1) {
- print "White balance extraction tool for UFRaw\n";
- print "By Colin Bennett 24 June 2006\n";
- print "Usage: $0 FILES...\n";
- exit(0);
-}
-
-# debug:
-#my ($lastmul1, $lastmul2, $lastmul3) = (0,0,0);
-
-for my $file (@ARGV) {
- my ($make, $model, $wbname, $wbfinetune, $mulred, $mulgreen, $mulblue);
-
- $mulgreen = 1; # default value for green balance
-
- open(EXIFTOOL, "exiftool -s -t -Model -ColorBalance1 -RedBalance -BlueBalance -WhiteBalance -WhiteBalanceFineTune $file|")
- or die "can't open $file: $!";
- while (my $line = <EXIFTOOL>) {
- $line =~ /([^\t]+)\t(.*)/ or next;
- my ($field, $value) = ($1, $2);
- if ($field eq "Model") {
- ($make, $model) = split(/ +/, $value);
- } elsif ($field eq "ColorBalance1") { # Field for D200
- my $mul_unknown;
- ($mulred, $mulblue, $mulgreen, $mul_unknown) = split(/ +/, $value);
- } elsif ($field eq "RedBalance") { # Field for D70 (red)
- $mulred = $value;
- } elsif ($field eq "BlueBalance") { # Field for D70 (blue)
- $mulblue = $value;
- } elsif ($field eq "WhiteBalance") {
- $wbname = $value;
- } elsif ($field eq "WhiteBalanceFineTune") {
- $wbfinetune = $value;
- }
- }
- close EXIFTOOL;
-
- # Fix names for consistency across Nikon cameras (D70 and D2X use "Direct sunlight")
- $wbname =~ s/^Sunny$/Direct sunlight/;
-
- # Format and print the line
- my $result;
- $result = sprintf " { \"%s\", \"%s\", \"%s\", %d,", $make, $model, $wbname, $wbfinetune;
- $result .= " " while length($result) < 48;
- $result .= "{ $mulred, $mulgreen, $mulblue, 0 } },";
-
- # debug: add deltas
- #$result .= sprintf "/* dm1=%.4f dm2=%.4f dm3=%.4f */", $mul1-$lastmul1, $mul2-$lastmul2, $mul3-$lastmul3;
- #$lastmul1 = $mul1;
- #$lastmul2 = $mul2;
- #$lastmul3 = $mul3;
-
- print $result, "\n";
-}
-
-# sample output:
-# { "NIKON", "D200", "Incandescent", 0, { 1.148438, 1, 2.398438, 0 } },
-
-# sample exiftool output:
-#cdb@gamma D200-wb $ exiftool -s -t -ColorBalance1 -WhiteBalance -WhiteBalanceFineTune dsc_0254.nef
-#ColorBalance1 1.234375 2.136719 1 1
-#WhiteBalance Incandescent
-#WhiteBalanceFineTune -3
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...