Hello community, here is the log from the commit of package libraw for openSUSE:Factory checked in at Tue Jun 14 12:14:51 CEST 2011. -------- --- GNOME/libraw/libraw.changes 2011-03-13 13:53:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/libraw/libraw.changes 2011-06-12 02:13:57.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Jun 12 00:07:49 UTC 2011 - Nico.Laus.2001@gmx.de + +- update to 0.13.5 +* Imported new dcraw 9.08/1.443: + New color data for Canon 600D and 1100D, Fuji S200EXR + New camera supported: Fuji HS20EXR and F550EXR, Kodak Z990, + Nikon D5100, Olympus E-PL1s and XZ-1, Samsung NX11, + Sony A230 and 290. +- update to 0.13.4 +* Imported new dcraw 9.07/1.442: + support for Canon 600D and 1100D, Hasselblad H4D-60, Olympus E-PL2 +* Color data for Leaf Aptus II and Canon Powershot S2 IS +- update to 0.13.3 +* Preliminary support for Leaf Aptus II cameras (no color data yet): + Leaf Aptus II 6,7,8,10 and 12 are tested, Aptus II 5 should work. +* Preliminary support for Fujifilm X100 camera (again, no color data). +* Fixed possible after the end of buffer read when working with + in-memory RAW data. +* Fixed possible loss of JPEG stream sync marks in LJPEG decoder + (this bug was found only for Leaf Aptus II RAWs). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service:recompress:download_url:LibRaw-0.13.2.tar.bz2 New: ---- _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw.spec ++++++ --- /var/tmp/diff_new_pack.Wi56ad/_old 2011-06-14 12:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Wi56ad/_new 2011-06-14 12:14:23.000000000 +0200 @@ -19,7 +19,7 @@ %define fake_name LibRaw Name: libraw -Version: 0.13.2 +Version: 0.13.5 Release: 1 License: CDDLv1.0 | LGPLv2.1 Summary: Library for reading RAW files obtained from digital photo cameras ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Wi56ad/_old 2011-06-14 12:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Wi56ad/_new 2011-06-14 12:14:23.000000000 +0200 @@ -1,13 +1,14 @@ +<?xml version="1.0" ?> <services> <service name="download_url"> <param name="protocol">http</param> <param name="host">www.libraw.org</param> - <param name="path">/data/LibRaw-0.13.2.tar.gz</param> + <param name="path">/data/LibRaw-0.13.5.tar.gz</param> </service> <service name="verify_file"> - <param name="file">_service:download_url:LibRaw-0.13.2.tar.gz</param> + <param name="file">_service:download_url:LibRaw-0.13.5.tar.gz</param> <param name="verifier">sha256</param> - <param name="checksum">8977a0a147fd811f62012bcf792611e6f5a160ac31ed1e86ad5731c69bb4f95a</param> + <param name="checksum">7e554d5fd6ca6f430d74e4c7084086cf57bd0c478268412920c0ce2940b86fe8</param> </service> <service name="recompress"> <param name="compression">bz2</param> ++++++ _service:recompress:download_url:LibRaw-0.13.2.tar.bz2 -> _service:recompress:download_url:LibRaw-0.13.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/Changelog.rus new/LibRaw-0.13.5/Changelog.rus --- old/LibRaw-0.13.2/Changelog.rus 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/Changelog.rus 2011-05-21 16:31:34.000000000 +0200 @@ -1,4 +1,31 @@ -2011-03-08 Alex Tutubalin <lexa@lexa.ru> +2011-05-18 Alex Tutubalin <lexa@lexa.ru> + * Imported new dcraw 9.08/1.443: + + Новые цветовые данные для камер Canon 600D и 1100D, Fuji S200EXR + + Поддержка новых камер: Fuji HS20EXR и F550EXR, Kodak Z990, + Nikon D5100, Olympus E-PL1s и XZ-1, + Samsung NX11, Sony A230 и 290. + * LibRaw 0.13.5-Release + +2011-04-02 Alex Tutubalin <lexa@lexa.ru> + * Импортирована dcraw 9.07/1.442: + + Поддержка новых камер: Canon 600D и 1100D, Hasselblad H4D-60, + Olympus E-PL2 + * Цветовые данные для Leaf Aptus II и Canon Powershot S2 IS + * LibRaw 0.13.4-Release + +2011-03-30 Alex Tutubalin <lexa@lexa.ru> + * Предварительная поддержка для камер Leaf Aptus II (без цветовых + данных). Протестировано на файлах Leaf Aptus II 6,7,8,10 и 12, + должно работать с Aptus II 5. + * Предварительная поддержка для Fujifilm X100 (тоже без цветовых + матриц). + * Исправлено возможное заглядывание за конец буфера при обработке + RAW-данных из файла. + * Исправлена возможная потеря маркера синхронизации в LJPEG-потоке + (проявлялась только на данных с камер Leaf Aptus II) + * LibRaw 0.13.3-Release + +2011-03-08 Alex Tutubalin <lexa@lexa.ru> * Исправлена ошибка чтения камерного баланса белого для некоторых камер Sony * LibRaw 0.13.2-Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/Changelog.txt new/LibRaw-0.13.5/Changelog.txt --- old/LibRaw-0.13.2/Changelog.txt 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/Changelog.txt 2011-05-21 16:31:34.000000000 +0200 @@ -1,3 +1,28 @@ +2011-05-18 Alex Tutubalin <lexa@lexa.ru> + * Imported new dcraw 9.08/1.443: + + New color data for Canon 600D and 1100D, Fuji S200EXR + + New camera supported: Fuji HS20EXR and F550EXR, Kodak Z990, + Nikon D5100, Olympus E-PL1s and XZ-1, + Samsung NX11, Sony A230 and 290. + * LibRaw 0.13.5-Release + +2011-04-02 Alex Tutubalin <lexa@lexa.ru> + * Imported new dcraw 9.07/1.442: + + Support for Canon 600D and 1100D, Hasselblad H4D-60, + Olympus E-PL2 + * Color data for Leaf Aptus II and Canon Powershot S2 IS + * LibRaw 0.13.4-Release + +2011-03-30 Alex Tutubalin <lexa@lexa.ru> + * Preliminary support for Leaf Aptus II cameras (no color data yet): + Leaf Aptus II 6,7,8,10 and 12 are tested, Aptus II 5 should work. + * Preliminary support for Fujifilm X100 camera (again, no color data). + * Fixed possible after the end of buffer read when working with + in-memory data. + * Fixed possible loss of JPEG stream sync marks in LJPEG decoder + (this bug was found only for Leaf Aptus II RAWs). + * LibRaw 0.13.3-Release + 2011-03-08 Alex Tutubalin <lexa@lexa.ru> * Fixed broken camera white balance reading for some Sony cameras * LibRaw 0.13.2-Release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/autom4te.cache/output.0 new/LibRaw-0.13.5/autom4te.cache/output.0 --- old/LibRaw-0.13.2/autom4te.cache/output.0 2011-03-08 16:45:15.000000000 +0100 +++ new/LibRaw-0.13.5/autom4te.cache/output.0 2011-05-21 16:46:35.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.2. +@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.5. @%:@ @%:@ Report bugs to <info@libraw.org>. @%:@ @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.13.2' -PACKAGE_STRING='LibRaw 0.13.2' +PACKAGE_VERSION='0.13.5' +PACKAGE_STRING='LibRaw 0.13.5' PACKAGE_BUGREPORT='info@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures LibRaw 0.13.2 to adapt to many kinds of systems. +`configure' configures LibRaw 0.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.13.2:";; + short | recursive ) echo "Configuration of LibRaw 0.13.5:";; esac cat <<_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -LibRaw configure 0.13.2 +LibRaw configure 0.13.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.13.2, which was +It was created by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2729,7 +2729,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.13.2' + VERSION='0.13.5' # Some tools Automake needs. @@ -15003,9 +15003,9 @@ LIBS="$LIBS -lm -lstdc++" -LIBRAW_SHLIB_VERSION=2:1:0 +LIBRAW_SHLIB_VERSION=2:4:0 -LIBRAW_RELEASE_VERSION=0.13.2 +LIBRAW_RELEASE_VERSION=0.13.5 cat >confcache <<_ACEOF @@ -15586,7 +15586,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.13.2, which was +This file was extended by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15644,7 +15644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`" ac_cs_version="\ -LibRaw config.status 0.13.2 +LibRaw config.status 0.13.5 configured by $0, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/autom4te.cache/output.1 new/LibRaw-0.13.5/autom4te.cache/output.1 --- old/LibRaw-0.13.2/autom4te.cache/output.1 2011-03-08 16:45:18.000000000 +0100 +++ new/LibRaw-0.13.5/autom4te.cache/output.1 2011-05-21 16:46:38.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.2. +@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.5. @%:@ @%:@ Report bugs to <info@libraw.org>. @%:@ @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.13.2' -PACKAGE_STRING='LibRaw 0.13.2' +PACKAGE_VERSION='0.13.5' +PACKAGE_STRING='LibRaw 0.13.5' PACKAGE_BUGREPORT='info@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures LibRaw 0.13.2 to adapt to many kinds of systems. +`configure' configures LibRaw 0.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.13.2:";; + short | recursive ) echo "Configuration of LibRaw 0.13.5:";; esac cat <<_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -LibRaw configure 0.13.2 +LibRaw configure 0.13.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.13.2, which was +It was created by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2729,7 +2729,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.13.2' + VERSION='0.13.5' # Some tools Automake needs. @@ -15003,9 +15003,9 @@ LIBS="$LIBS -lm -lstdc++" -LIBRAW_SHLIB_VERSION=2:1:0 +LIBRAW_SHLIB_VERSION=2:4:0 -LIBRAW_RELEASE_VERSION=0.13.2 +LIBRAW_RELEASE_VERSION=0.13.5 cat >confcache <<_ACEOF @@ -15586,7 +15586,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.13.2, which was +This file was extended by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15644,7 +15644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`" ac_cs_version="\ -LibRaw config.status 0.13.2 +LibRaw config.status 0.13.5 configured by $0, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/autom4te.cache/output.2 new/LibRaw-0.13.5/autom4te.cache/output.2 --- old/LibRaw-0.13.2/autom4te.cache/output.2 2011-03-08 16:45:18.000000000 +0100 +++ new/LibRaw-0.13.5/autom4te.cache/output.2 2011-05-21 16:46:37.000000000 +0200 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.2. +@%:@ Generated by GNU Autoconf 2.68 for LibRaw 0.13.5. @%:@ @%:@ Report bugs to <info@libraw.org>. @%:@ @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.13.2' -PACKAGE_STRING='LibRaw 0.13.2' +PACKAGE_VERSION='0.13.5' +PACKAGE_STRING='LibRaw 0.13.5' PACKAGE_BUGREPORT='info@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures LibRaw 0.13.2 to adapt to many kinds of systems. +`configure' configures LibRaw 0.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.13.2:";; + short | recursive ) echo "Configuration of LibRaw 0.13.5:";; esac cat <<_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -LibRaw configure 0.13.2 +LibRaw configure 0.13.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.13.2, which was +It was created by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2729,7 +2729,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.13.2' + VERSION='0.13.5' # Some tools Automake needs. @@ -15003,9 +15003,9 @@ LIBS="$LIBS -lm -lstdc++" -LIBRAW_SHLIB_VERSION=2:1:0 +LIBRAW_SHLIB_VERSION=2:4:0 -LIBRAW_RELEASE_VERSION=0.13.2 +LIBRAW_RELEASE_VERSION=0.13.5 cat >confcache <<_ACEOF @@ -15586,7 +15586,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.13.2, which was +This file was extended by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15644,7 +15644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`" ac_cs_version="\ -LibRaw config.status 0.13.2 +LibRaw config.status 0.13.5 configured by $0, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/autom4te.cache/traces.1 new/LibRaw-0.13.5/autom4te.cache/traces.1 --- old/LibRaw-0.13.2/autom4te.cache/traces.1 2011-03-08 16:45:18.000000000 +0100 +++ new/LibRaw-0.13.5/autom4te.cache/traces.1 2011-05-21 16:46:38.000000000 +0200 @@ -4,7 +4,7 @@ m4trace:aclocal.m4:1113: -1- m4_include([m4/ltsugar.m4]) m4trace:aclocal.m4:1114: -1- m4_include([m4/ltversion.m4]) m4trace:aclocal.m4:1115: -1- m4_include([m4/lt~obsolete.m4]) -m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.13.2], [info@libraw.org], [], [http://www.libraw.org]) +m4trace:configure.ac:2: -1- AC_INIT([LibRaw], [0.13.5], [info@libraw.org], [], [http://www.libraw.org]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) @@ -624,10 +624,10 @@ m4trace:configure.ac:77: -1- m4_pattern_allow([^EXAMPLES_FALSE$]) m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([EXAMPLES_TRUE]) m4trace:configure.ac:77: -1- _AM_SUBST_NOTMAKE([EXAMPLES_FALSE]) -m4trace:configure.ac:167: -1- AC_SUBST([LIBRAW_SHLIB_VERSION], [2:1:0]) +m4trace:configure.ac:167: -1- AC_SUBST([LIBRAW_SHLIB_VERSION], [2:4:0]) m4trace:configure.ac:167: -1- AC_SUBST_TRACE([LIBRAW_SHLIB_VERSION]) m4trace:configure.ac:167: -1- m4_pattern_allow([^LIBRAW_SHLIB_VERSION$]) -m4trace:configure.ac:168: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.13.2]) +m4trace:configure.ac:168: -1- AC_SUBST([LIBRAW_RELEASE_VERSION], [0.13.5]) m4trace:configure.ac:168: -1- AC_SUBST_TRACE([LIBRAW_RELEASE_VERSION]) m4trace:configure.ac:168: -1- m4_pattern_allow([^LIBRAW_RELEASE_VERSION$]) m4trace:configure.ac:170: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/configure new/LibRaw-0.13.5/configure --- old/LibRaw-0.13.2/configure 2011-03-08 16:45:18.000000000 +0100 +++ new/LibRaw-0.13.5/configure 2011-05-21 16:46:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for LibRaw 0.13.2. +# Generated by GNU Autoconf 2.68 for LibRaw 0.13.5. # # Report bugs to <info@libraw.org>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='LibRaw' PACKAGE_TARNAME='libraw' -PACKAGE_VERSION='0.13.2' -PACKAGE_STRING='LibRaw 0.13.2' +PACKAGE_VERSION='0.13.5' +PACKAGE_STRING='LibRaw 0.13.5' PACKAGE_BUGREPORT='info@libraw.org' PACKAGE_URL='http://www.libraw.org' @@ -1327,7 +1327,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -`configure' configures LibRaw 0.13.2 to adapt to many kinds of systems. +`configure' configures LibRaw 0.13.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1397,7 +1397,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LibRaw 0.13.2:";; + short | recursive ) echo "Configuration of LibRaw 0.13.5:";; esac cat <<_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -LibRaw configure 0.13.2 +LibRaw configure 0.13.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1914,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LibRaw $as_me 0.13.2, which was +It was created by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2729,7 +2729,7 @@ # Define the identity of the package. PACKAGE='libraw' - VERSION='0.13.2' + VERSION='0.13.5' # Some tools Automake needs. @@ -15003,9 +15003,9 @@ LIBS="$LIBS -lm -lstdc++" -LIBRAW_SHLIB_VERSION=2:1:0 +LIBRAW_SHLIB_VERSION=2:4:0 -LIBRAW_RELEASE_VERSION=0.13.2 +LIBRAW_RELEASE_VERSION=0.13.5 cat >confcache <<_ACEOF @@ -15586,7 +15586,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LibRaw $as_me 0.13.2, which was +This file was extended by LibRaw $as_me 0.13.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15644,7 +15644,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`" ac_cs_version="\ -LibRaw config.status 0.13.2 +LibRaw config.status 0.13.5 configured by $0, generated by GNU Autoconf 2.68, with options \"$ac_cs_config\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/dcraw/dcraw.c new/LibRaw-0.13.5/dcraw/dcraw.c --- old/LibRaw-0.13.2/dcraw/dcraw.c 2011-01-29 08:43:38.000000000 +0100 +++ new/LibRaw-0.13.5/dcraw/dcraw.c 2011-05-11 05:09:54.000000000 +0200 @@ -19,11 +19,11 @@ *If you have not modified dcraw.c in any way, a link to my homepage qualifies as "full source code". - $Revision: 1.440 $ - $Date: 2011/01/29 07:43:38 $ + $Revision: 1.443 $ + $Date: 2011/05/11 03:09:54 $ */ -#define VERSION "9.06" +#define VERSION "9.08" #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -897,6 +897,8 @@ for (jrow=0; jrow < jh.high; jrow++) { rp = ljpeg_row (jrow, &jh); + if (load_flags & 1) + row = jrow & 1 ? height-1-jrow/2 : jrow/2; for (jcol=0; jcol < jwide; jcol++) { val = *rp++; if (jh.bits <= 12) @@ -1646,7 +1648,7 @@ order = 0x4949; ph1_bits(-1); for (row=-top_margin; row < height; row++) { - pred[0] = pred[1] = 0x8000; + pred[0] = pred[1] = 0x8000 + load_flags; for (col=-left_margin; col < raw_width-left_margin; col+=2) { FORC(2) len[c] = ph1_huff(jh.huff[0]); FORC(2) { @@ -4406,10 +4408,12 @@ base = ftell(ifp)-10; fseek (ifp, -2, SEEK_CUR); order = get2(); get2(); - } else if (!strncmp (buf,"FUJIFILM",8) || - !strncmp (buf,"SONY",4) || + } else if (!strncmp (buf,"SONY",4) || !strcmp (buf,"Panasonic")) { - order = 0x4949; + goto nf; + } else if (!strncmp (buf,"FUJIFILM",8)) { + base = ftell(ifp)-10; +nf: order = 0x4949; fseek (ifp, 2, SEEK_CUR); } else if (!strcmp (buf,"OLYMP") || !strcmp (buf,"LEICA") || @@ -4429,7 +4433,7 @@ while (entries--) { tiff_get (base, &tag, &type, &len, &save); tag |= uptag << 16; - if (tag == 2 && strstr(make,"NIKON")) + if (tag == 2 && strstr(make,"NIKON") && !iso_speed) iso_speed = (get2(),get2()); if (tag == 4 && len > 26 && len < 35) { if ((i=(get4(),get2())) != 0x7fff && !iso_speed) @@ -4739,7 +4743,8 @@ static const char *mod[] = { "","DCB2","Volare","Cantare","CMost","Valeo 6","Valeo 11","Valeo 22", "Valeo 11p","Valeo 17","","Aptus 17","Aptus 22","Aptus 75","Aptus 65", - "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7" }; + "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7", + "","","","","","","","","","","","","","","","","","AFi-II 12" }; float romm_cam[3][3]; fseek (ifp, offset, SEEK_SET); @@ -4789,6 +4794,8 @@ FORC4 fscanf (ifp, "%d", neut+c); FORC3 cam_mul[c] = (float) neut[0] / neut[c+1]; } + if (!strcmp(data,"Rows_data")) + load_flags = get4(); parse_mos (from); fseek (ifp, skip+from, SEEK_SET); } @@ -4910,6 +4917,11 @@ tiff_ifd[ifd].samples = len & 7; tiff_ifd[ifd].bps = getint(type); break; + case 61446: + raw_height = 0; + load_raw = &CLASS packed_load_raw; + load_flags = 16 | (get4() && (filters=0x16161616)) << 3; + break; case 259: /* Compression */ tiff_ifd[ifd].comp = get2(); break; @@ -4933,7 +4945,7 @@ case 513: /* JpegIFOffset */ case 61447: tiff_ifd[ifd].offset = get4()+base; - if (!tiff_ifd[ifd].bps) { + if (!tiff_ifd[ifd].bps && tiff_ifd[ifd].offset > 0) { fseek (ifp, tiff_ifd[ifd].offset, SEEK_SET); if (ljpeg_start (&jh, 1)) { tiff_ifd[ifd].comp = 6; @@ -5811,16 +5823,17 @@ fuji_layout = fgetc(ifp) >> 7; load_raw = fgetc(ifp) & 8 ? &CLASS unpacked_load_raw : &CLASS fuji_load_raw; - } - if (tag == 0x2ff0) + } else if (tag == 0x2ff0) { FORC4 cam_mul[c ^ 1] = get2(); + } else if (tag == 0xc000) { + c = order; + order = 0x4949; + width = get4(); + height = get4(); + order = c; + } fseek (ifp, save+len, SEEK_SET); } - if (!raw_height) { - filters = 0x16161616; - load_raw = &CLASS packed_load_raw; - load_flags = 24; - } height <<= fuji_layout; width >>= fuji_layout; } @@ -6108,8 +6121,12 @@ { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, { "Canon EOS 550D", 0, 0x3dd7, { 6941,-1164,-857,-3825,11597,2534,-416,1540,6039 } }, + { "Canon EOS 600D", 0, 0x3510, + { 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } }, { "Canon EOS 1000D", 0, 0xe43, { 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } }, + { "Canon EOS 1100D", 0, 0x3510, + { 6444,-904,-893,-4563,12308,2535,-903,2016,6728 } }, { "Canon EOS-1Ds Mark III", 0, 0x3bb0, { 5859,-211,-930,-8255,16017,2353,-1732,1887,7448 } }, { "Canon EOS-1Ds Mark II", 0, 0xe80, @@ -6221,7 +6238,7 @@ { "FUJIFILM FinePix S100FS", 514, 0, { 11521,-4355,-1065,-6524,13767,3058,-1466,1984,6045 } }, { "FUJIFILM FinePix S200EXR", 512, 0x3fff, - { 0 } }, + { 11401,-4498,-1312,-5088,12751,2613,-838,1568,5941 } }, { "FUJIFILM FinePix S20Pro", 0, 0, { 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } }, { "FUJIFILM FinePix S2Pro", 128, 0, @@ -6258,6 +6275,12 @@ { 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } }, { "FUJIFILM FinePix HS10 HS11", 0, 0xf68, { 12440,-3954,-1183,-1123,9674,1708,-83,1614,4086 } }, + { "FUJIFILM FinePix HS20EXR", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM FinePix F550EXR", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM FinePix X100", 0, 0, + { 12161,-4457,-1069,-5034,12874,2400,-795,1724,6904 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, { "KODAK NC2000", 0, 0, @@ -6308,6 +6331,8 @@ { 11313,-3559,-1101,-3893,11891,2257,-1214,2398,4908 } }, { "KODAK EasyShare Z981", 0, 0, { 12729,-4717,-1188,-1367,9187,2582,274,860,4411 } }, + { "KODAK EasyShare Z990", 0, 0xfed, + { 11749,-4048,-1309,-1867,10572,1489,-138,1449,4522 } }, { "KODAK EASYSHARE Z1015", 0, 0xef1, { 11265,-4286,-992,-4694,12343,2647,-1090,1523,5447 } }, { "Leaf CMost", 0, 0, @@ -6378,6 +6403,8 @@ { 6992,-1668,-806,-8138,15748,2543,-874,850,7897 } }, { "NIKON D5000", 0, 0xf00, { 7309,-1403,-519,-8474,16008,2622,-2433,2826,8064 } }, + { "NIKON D5100", 0, 0x3de6, + { 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } }, { "NIKON D50", 0, 0, { 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } }, { "NIKON D60", 0, 0, @@ -6470,8 +6497,12 @@ { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, { "OLYMPUS E-P2", 0, 0xffd, { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, + { "OLYMPUS E-PL1s", 0, 0, + { 11409,-3872,-1393,-4572,12757,2003,-709,1810,7415 } }, { "OLYMPUS E-PL1", 0, 0, { 11408,-4289,-1215,-4286,12385,2118,-387,1467,7787 } }, + { "OLYMPUS E-PL2", 0, 0, + { 15030,-5552,-1806,-3987,12387,1767,-592,1670,7023 } }, { "OLYMPUS SP350", 0, 0, { 12078,-4836,-1069,-6671,14306,2578,-786,939,7418 } }, { "OLYMPUS SP3", 0, 0, @@ -6486,6 +6517,8 @@ { 10915,-3677,-982,-5587,12986,2911,-1168,1968,6223 } }, { "OLYMPUS SP570UZ", 0, 0, { 11522,-4044,-1146,-4736,12172,2904,-988,1829,6039 } }, + { "OLYMPUS XZ-1", 0, 0, + { 10901,-4095,-1074,-1141,9208,2293,-62,1417,5158 } }, { "PENTAX *ist DL2", 0, 0, { 10504,-2438,-1189,-8603,16207,2531,-1022,863,12242 } }, { "PENTAX *ist DL", 0, 0, @@ -6554,7 +6587,7 @@ { 8048,-2810,-623,-6450,13519,3272,-1700,2146,7049 } }, { "Panasonic DMC-LX3", 15, 0, { 8128,-2668,-655,-6134,13307,3161,-1782,2568,6083 } }, - { "LEICA D-LUX4", 15, 0, + { "LEICA D-LUX 4", 15, 0, { 8128,-2668,-655,-6134,13307,3161,-1782,2568,6083 } }, { "Panasonic DMC-LX5", 143, 0, { 10909,-4295,-948,-1333,9306,2399,22,1738,4582 } }, @@ -6588,7 +6621,7 @@ { 7914,1414,-1190,-8777,16582,2280,-2811,4605,5562 } }, { "SAMSUNG EX1", 0, 0x3e00, { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, - { "SAMSUNG NX10", 0, 0, + { "SAMSUNG NX1", 0, 0, { 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } }, { "SAMSUNG WB2000", 0, 0xfff, { 12093,-3557,-1155,-1000,9534,1733,-22,1787,4576 } }, @@ -6606,6 +6639,8 @@ { 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } }, { "SONY DSLR-A100", 0, 0xfeb, { 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } }, + { "SONY DSLR-A290", 0, 0, + { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, { "SONY DSLR-A2", 0, 0, { 9847,-3091,-928,-8485,16345,2225,-715,595,7103 } }, { "SONY DSLR-A300", 0, 0, @@ -6616,6 +6651,8 @@ { 6038,-1484,-578,-9146,16746,2513,-875,746,7217 } }, { "SONY DSLR-A380", 0, 0, { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, + { "SONY DSLR-A390", 0, 0, + { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, { "SONY DSLR-A450", 128, 0xfeb, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, { "SONY DSLR-A580", 128, 0xfeb, @@ -6909,9 +6946,11 @@ } else if (!strcmp (head, "qktk")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 100"); + load_raw = &CLASS quicktake_100_load_raw; } else if (!strcmp (head, "qktn")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 150"); + load_raw = &CLASS kodak_radc_load_raw; } else if (!memcmp (head,"FUJIFILM",8)) { fseek (ifp, 84, SEEK_SET); thumb_offset = get4(); @@ -6924,7 +6963,7 @@ if (is_raw == 2 && shot_select) parse_fuji (i); } - fseek (ifp, 100, SEEK_SET); + fseek (ifp, 100+28*(shot_select > 0), SEEK_SET); parse_tiff (data_offset = get4()); parse_tiff (thumb_offset+12); apply_tiff(); @@ -7314,6 +7353,12 @@ if (unique_id == 0x80000176) adobe_coeff ("Canon","EOS 450D"); goto canon_cr2; + } else if (is_canon && raw_width == 4352) { + top_margin = 18; + left_margin = 62; + if (unique_id == 0x80000288) + adobe_coeff ("Canon","EOS 1100D"); + goto canon_cr2; } else if (is_canon && raw_width == 4476) { top_margin = 34; left_margin = 90; @@ -7339,6 +7384,8 @@ left_margin = 142; if (unique_id == 0x80000270) adobe_coeff ("Canon","EOS 550D"); + if (unique_id == 0x80000286) + adobe_coeff ("Canon","EOS 600D"); goto canon_cr2; } else if (is_canon && raw_width == 5360) { top_margin = 51; @@ -7378,7 +7425,8 @@ left_margin = 2; } else if (!strcmp(model,"D5000")) { width -= 42; - } else if (!strcmp(model,"D7000")) { + } else if (!strcmp(model,"D5100") || + !strcmp(model,"D7000")) { width -= 44; } else if (!strcmp(model,"D3100")) { width -= 28; @@ -7410,6 +7458,8 @@ } else if (!strncmp(model,"COOLPIX P",9)) { load_flags = 24; filters = 0x94949494; + if (model[9] == '7' && iso_speed >= 400) + black = 255; } else if (fsize == 1581060) { height = 963; width = 1287; @@ -7515,14 +7565,14 @@ width = 2880; flip = 6; } else if (load_raw != &CLASS packed_load_raw) - maximum = 0x3e00; - if (is_raw == 2 && shot_select) - maximum = 0x2f00; - top_margin = (raw_height - height)/2; - left_margin = (raw_width - width )/2; - if (is_raw == 2) - data_offset += (shot_select > 0) * ( fuji_layout ? - (raw_width *= 2) : raw_height*raw_width*2 ); + maximum = (is_raw == 2 && shot_select) ? 0x2f00 : 0x3e00; + top_margin = (raw_height - height) >> 2 << 1; + left_margin = (raw_width - width ) >> 2 << 1; + if (width == 3328) { + width = 3262; + left_margin = 34; + } + if (fuji_layout) raw_width *= is_raw; if (load_raw == &CLASS fuji_load_raw) { fuji_width = width >> !fuji_layout; width = (height >> fuji_layout) + fuji_width; @@ -7619,24 +7669,28 @@ raw_width = fsize/height/2; order = 0x4d4d; load_raw = &CLASS unpacked_load_raw; - } else if (!strcmp(model,"NX10")) { - height -= top_margin = 4; + } else if (!strncmp(model,"NX1",3)) { + height -= top_margin = 8; width -= 2 * (left_margin = 8); load_flags = 32; } else if (!strcmp(model,"EX1")) { order = 0x4949; - height = 2760; + height -= 20; top_margin = 2; if ((width -= 6) > 3682) { - height = 2750; - width = 3668; + height -= 10; + width -= 46; top_margin = 8; } } else if (!strcmp(model,"WB2000")) { order = 0x4949; height -= 3; - width -= 10; top_margin = 2; + if ((width -= 10) > 3718) { + height -= 28; + width -= 56; + top_margin = 8; + } } else if (fsize == 20487168) { height = 2808; width = 3648; @@ -7740,6 +7794,13 @@ top_margin = 4; left_margin = 41; filters = 0x61616161; + } else if (raw_width == 9044) { + height = 6716; + width = 8964; + top_margin = 8; + left_margin = 40; + black += load_flags = 256; + maximum = 0x8101; } else if (raw_width == 4090) { strcpy (model, "V96C"); height -= (top_margin = 6); @@ -7762,8 +7823,10 @@ if (ljpeg_start (&jh, 1) && jh.bits == 15) maximum = 0x1fff; if (tiff_samples > 1) filters = 0; - if (tiff_samples > 1 || tile_length < raw_height) + if (tiff_samples > 1 || tile_length < raw_height) { load_raw = &CLASS leaf_hdr_load_raw; + raw_width = tile_width; + } if ((width | height) == 2048) { if (tiff_samples == 1) { filters = 1; @@ -7916,7 +7979,7 @@ } else gamma_curve (0, 3.875, 1, 255); load_raw = &CLASS eight_bit_load_raw; } else if (!strncasecmp(model,"EasyShare",9)) { - data_offset = 0x15000; + data_offset = data_offset < 0x15000 ? 0x15000 : 0x17000; load_raw = &CLASS packed_load_raw; } else if (!strcasecmp(make,"KODAK")) { if (filters == UINT_MAX) filters = 0x61616161; @@ -8010,7 +8073,8 @@ load_raw = &CLASS kodak_radc_load_raw; filters = 0x61616161; simple_coeff(2); - } else if (!strcmp(model,"QuickTake 100")) { + } else if (!strncmp(model,"QuickTake",9)) { + if (head[5]) strcpy (model+10, "200"); fseek (ifp, 544, SEEK_SET); height = get2(); width = get2(); @@ -8020,14 +8084,6 @@ fseek (ifp, data_offset-6, SEEK_SET); flip = ~get2() & 3 ? 5:6; } - load_raw = &CLASS quicktake_100_load_raw; - filters = 0x61616161; - } else if (!strcmp(model,"QuickTake 150")) { - data_offset = 738 - head[5]; - if (head[5]) strcpy (model+10, "200"); - load_raw = &CLASS kodak_radc_load_raw; - height = 480; - width = 640; filters = 0x61616161; } else if (!strcmp(make,"Rollei") && !load_raw) { switch (raw_width) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/internal/dcraw_common.cpp new/LibRaw-0.13.5/internal/dcraw_common.cpp --- old/LibRaw-0.13.2/internal/dcraw_common.cpp 2011-03-08 16:45:11.000000000 +0100 +++ new/LibRaw-0.13.5/internal/dcraw_common.cpp 2011-05-21 16:46:33.000000000 +0200 @@ -850,6 +850,8 @@ #else rp = ljpeg_row (jrow, &jh); #endif + if (load_flags & 1) + row = jrow & 1 ? height-1-jrow/2 : jrow/2; for (jcol=0; jcol < jwide; jcol++) { val = *rp++; if (jh.bits <= 12) @@ -1919,7 +1921,7 @@ order = 0x4949; ph1_bits(-1); for (row=-top_margin; row < raw_height-top_margin; row++) { - pred[0] = pred[1] = 0x8000; + pred[0] = pred[1] = 0x8000 + load_flags; for (col=-left_margin; col < raw_width-left_margin; col+=2) { FORC(2) len[c] = ph1_huff(jh.huff[0]); FORC(2) { @@ -4762,10 +4764,12 @@ base = ftell(ifp)-10; fseek (ifp, -2, SEEK_CUR); order = get2(); get2(); - } else if (!strncmp (buf,"FUJIFILM",8) || - !strncmp (buf,"SONY",4) || + } else if (!strncmp (buf,"SONY",4) || !strcmp (buf,"Panasonic")) { - order = 0x4949; + goto nf; + } else if (!strncmp (buf,"FUJIFILM",8)) { + base = ftell(ifp)-10; +nf: order = 0x4949; fseek (ifp, 2, SEEK_CUR); } else if (!strcmp (buf,"OLYMP") || !strcmp (buf,"LEICA") || @@ -4785,7 +4789,7 @@ while (entries--) { tiff_get (base, &tag, &type, &len, &save); tag |= uptag << 16; - if (tag == 2 && strstr(make,"NIKON")) + if (tag == 2 && strstr(make,"NIKON") && !iso_speed) iso_speed = (get2(),get2()); if (tag == 4 && len > 26 && len < 35) { if ((i=(get4(),get2())) != 0x7fff && !iso_speed) @@ -5141,7 +5145,10 @@ static const char *mod[] = { "","DCB2","Volare","Cantare","CMost","Valeo 6","Valeo 11","Valeo 22", "Valeo 11p","Valeo 17","","Aptus 17","Aptus 22","Aptus 75","Aptus 65", - "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7" }; + "Aptus 54S","Aptus 65S","Aptus 75S","AFi 5","AFi 6","AFi 7", + "AFi-II 7","","","AFi-II 6","","","AFi-II 10","AFi-II 5" + "","","","","","AFi-II 10R","AFi-II 8","","AFi-II 12"}; + float romm_cam[3][3]; fseek (ifp, offset, SEEK_SET); @@ -5194,6 +5201,8 @@ color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; #endif } + if (!strcmp(data,"Rows_data")) + load_flags = get4(); parse_mos (from); fseek (ifp, skip+from, SEEK_SET); } @@ -5333,6 +5342,11 @@ tiff_ifd[ifd].samples = len & 7; tiff_ifd[ifd].bps = getint(type); break; + case 61446: + raw_height = 0; + load_raw = &CLASS packed_load_raw; + load_flags = 16 | (get4() && (filters=0x16161616)) << 3; + break; case 259: /* Compression */ tiff_ifd[ifd].comp = get2(); break; @@ -5356,7 +5370,7 @@ case 513: /* JpegIFOffset */ case 61447: tiff_ifd[ifd].offset = get4()+base; - if (!tiff_ifd[ifd].bps) { + if (!tiff_ifd[ifd].bps && tiff_ifd[ifd].offset > 0) { fseek (ifp, tiff_ifd[ifd].offset, SEEK_SET); if (ljpeg_start (&jh, 1)) { tiff_ifd[ifd].comp = 6; @@ -6349,21 +6363,20 @@ fuji_layout = fgetc(ifp) >> 7; load_raw = fgetc(ifp) & 8 ? &CLASS unpacked_load_raw : &CLASS fuji_load_raw; - } - if (tag == 0x2ff0) - { + } else if (tag == 0x2ff0) { FORC4 cam_mul[c ^ 1] = get2(); #ifdef LIBRAW_LIBRARY_BUILD color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED; #endif - } + } else if (tag == 0xc000) { + c = order; + order = 0x4949; + width = get4(); + height = get4(); + order = c; + } fseek (ifp, save+len, SEEK_SET); } - if (!raw_height) { - filters = 0x16161616; - load_raw = &CLASS packed_load_raw; - load_flags = 24; - } height <<= fuji_layout; width >>= fuji_layout; } @@ -6558,8 +6571,12 @@ { 4763,712,-646,-6821,14399,2640,-1921,3276,6561 } }, { "Canon EOS 550D", 0, 0x3dd7, { 6941,-1164,-857,-3825,11597,2534,-416,1540,6039 } }, + { "Canon EOS 600D", 0, 0x3510, + { 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } }, { "Canon EOS 1000D", 0, 0xe43, { 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } }, + { "Canon EOS 1100D", 0, 0x3510, + { 6444,-904,-893,-4563,12308,2535,-903,2016,6728 } }, { "Canon EOS-1Ds Mark III", 0, 0x3bb0, { 5859,-211,-930,-8255,16017,2353,-1732,1887,7448 } }, { "Canon EOS-1Ds Mark II", 0, 0xe80, @@ -6638,6 +6655,8 @@ { 9427,-3036,-959,-2581,10671,1911,-1039,1982,4430 } }, { "Canon PowerShot A720", 0, 0, /* DJC */ { 14573,-5482,-1546,-1266,9799,1468,-1040,1912,3810 } }, + { "Canon PowerShot S2 IS", 0, 0, /* jlb */ + { 14062,-5199,-1446,-4712,12470,2243,-1286,2028,4836 } }, /* jlb - copied from Powershot S3 IS */ { "Canon PowerShot S3 IS", 0, 0, /* DJC */ { 14062,-5199,-1446,-4712,12470,2243,-1286,2028,4836 } }, { "Canon PowerShot SX1 IS", 0, 0, @@ -6671,7 +6690,7 @@ { "FUJIFILM FinePix S100FS", 514, 0, { 11521,-4355,-1065,-6524,13767,3058,-1466,1984,6045 } }, { "FUJIFILM FinePix S200EXR", 512, 0x3fff, - { 0 } }, + { 11401,-4498,-1312,-5088,12751,2613,-838,1568,5941 } }, { "FUJIFILM FinePix S20Pro", 0, 0, { 10004,-3219,-1201,-7036,15047,2107,-1863,2565,7736 } }, { "FUJIFILM FinePix S2Pro", 128, 0, @@ -6708,6 +6727,12 @@ { 12300,-5110,-1304,-9117,17143,1998,-1947,2448,8100 } }, { "FUJIFILM FinePix HS10 HS11", 0, 0xf68, { 12440,-3954,-1183,-1123,9674,1708,-83,1614,4086 } }, + { "FUJIFILM FinePix HS20EXR", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM FinePix F550EXR", 0, 0, + { 13690,-5358,-1474,-3369,11600,1998,-132,1554,4395 } }, + { "FUJIFILM FinePix X100", 0, 0, + { 12161,-4457,-1069,-5034,12874,2400,-795,1724,6904 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, { "KODAK NC2000", 0, 0, @@ -6758,6 +6783,8 @@ { 11313,-3559,-1101,-3893,11891,2257,-1214,2398,4908 } }, { "KODAK EasyShare Z981", 0, 0, { 12729,-4717,-1188,-1367,9187,2582,274,860,4411 } }, + { "KODAK EasyShare Z990", 0, 0xfed, + { 11749,-4048,-1309,-1867,10572,1489,-138,1449,4522 } }, { "KODAK EASYSHARE Z1015", 0, 0xef1, { 11265,-4286,-992,-4694,12343,2647,-1090,1523,5447 } }, { "Leaf CMost", 0, 0, @@ -6770,6 +6797,24 @@ { 7914,1414,-1190,-8777,16582,2280,-2811,4605,5562 } }, { "Leaf Aptus 75", 0, 0, { 7914,1414,-1190,-8777,16582,2280,-2811,4605,5562 } }, +#if 0 + { "Leaf Aptus 22", 0, 0, + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, +#endif + { "Leaf Aptus-II 5", 0, 0, // Mamiya 645 AFD + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, + { "Leaf Aptus-II 6", 0, 0, + { 7914, 1414, -1190, -8777, 16582, 2280, -2811, 4605, 5562, } }, + { "Leaf Aptus-II 7", 0, 0, + { 7914, 1414, -1190, -8777, 16582, 2280, -2811, 4605, 5562, } }, + { "Leaf Aptus-II 8", 0, 0, // Hasselblad 500 Series + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, + { "Leaf Aptus-II 10", 0, 0, + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, + { "Leaf Aptus-II 10R", 0, 0, + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, + { "Leaf Aptus-II 12", 0, 0, + { 8236, 1746, -1314, -8251, 15953, 2428, -3673, 5786, 5770, } }, { "Leaf", 0, 0, { 8236,1746,-1314,-8251,15953,2428,-3673,5786,5771 } }, { "Mamiya ZD", 0, 0, @@ -6828,6 +6873,8 @@ { 6992,-1668,-806,-8138,15748,2543,-874,850,7897 } }, { "NIKON D5000", 0, 0xf00, { 7309,-1403,-519,-8474,16008,2622,-2433,2826,8064 } }, + { "NIKON D5100", 0, 0x3de6, + { 8198,-2239,-724,-4871,12389,2798,-1043,2050,7181 } }, { "NIKON D50", 0, 0, { 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } }, { "NIKON D60", 0, 0, @@ -6920,8 +6967,12 @@ { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, { "OLYMPUS E-P2", 0, 0xffd, { 8343,-2050,-1021,-7715,15705,2103,-1831,2380,8235 } }, + { "OLYMPUS E-PL1s", 0, 0, + { 11409,-3872,-1393,-4572,12757,2003,-709,1810,7415 } }, { "OLYMPUS E-PL1", 0, 0, { 11408,-4289,-1215,-4286,12385,2118,-387,1467,7787 } }, + { "OLYMPUS E-PL2", 0, 0, + { 15030,-5552,-1806,-3987,12387,1767,-592,1670,7023 } }, { "OLYMPUS SP350", 0, 0, { 12078,-4836,-1069,-6671,14306,2578,-786,939,7418 } }, { "OLYMPUS SP3", 0, 0, @@ -6936,6 +6987,8 @@ { 10915,-3677,-982,-5587,12986,2911,-1168,1968,6223 } }, { "OLYMPUS SP570UZ", 0, 0, { 11522,-4044,-1146,-4736,12172,2904,-988,1829,6039 } }, + { "OLYMPUS XZ-1", 0, 0, + { 10901,-4095,-1074,-1141,9208,2293,-62,1417,5158 } }, { "PENTAX *ist DL2", 0, 0, { 10504,-2438,-1189,-8603,16207,2531,-1022,863,12242 } }, { "PENTAX *ist DL", 0, 0, @@ -7038,7 +7091,7 @@ { 7914,1414,-1190,-8777,16582,2280,-2811,4605,5562 } }, { "SAMSUNG EX1", 0, 0x3e00, { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, - { "SAMSUNG NX10", 0, 0, + { "SAMSUNG NX1", 0, 0, { 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } }, { "SAMSUNG WB2000", 0, 0xfff, { 12093,-3557,-1155,-1000,9534,1733,-22,1787,4576 } }, @@ -7056,6 +7109,8 @@ { 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } }, { "SONY DSLR-A100", 0, 0xfeb, { 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } }, + { "SONY DSLR-A290", 0, 0, + { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, { "SONY DSLR-A2", 0, 0, { 9847,-3091,-928,-8485,16345,2225,-715,595,7103 } }, { "SONY DSLR-A300", 0, 0, @@ -7388,9 +7443,11 @@ } else if (!strcmp (head, "qktk")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 100"); + load_raw = &CLASS quicktake_100_load_raw; } else if (!strcmp (head, "qktn")) { strcpy (make, "Apple"); strcpy (model,"QuickTake 150"); + load_raw = &CLASS kodak_radc_load_raw; } else if (!memcmp (head,"FUJIFILM",8)) { fseek (ifp, 84, SEEK_SET); thumb_offset = get4(); @@ -7403,7 +7460,7 @@ if (is_raw == 2 && shot_select) parse_fuji (i); } - fseek (ifp, 100, SEEK_SET); + fseek (ifp, 100+28*(shot_select > 0), SEEK_SET); parse_tiff (data_offset = get4()); parse_tiff (thumb_offset+12); apply_tiff(); @@ -7799,6 +7856,12 @@ if (unique_id == 0x80000176) adobe_coeff ("Canon","EOS 450D"); goto canon_cr2; + } else if (is_canon && raw_width == 4352) { + top_margin = 18; + left_margin = 62; + if (unique_id == 0x80000288) + adobe_coeff ("Canon","EOS 1100D"); + goto canon_cr2; } else if (is_canon && raw_width == 4476) { top_margin = 34; left_margin = 90; @@ -7824,6 +7887,8 @@ left_margin = 142; if (unique_id == 0x80000270) adobe_coeff ("Canon","EOS 550D"); + if (unique_id == 0x80000286) + adobe_coeff ("Canon","EOS 600D"); goto canon_cr2; } else if (is_canon && raw_width == 5360) { top_margin = 51; @@ -7863,7 +7928,8 @@ left_margin = 2; } else if (!strcmp(model,"D5000")) { width -= 42; - } else if (!strcmp(model,"D7000")) { + } else if (!strcmp(model,"D5100") || + !strcmp(model,"D7000")) { width -= 44; } else if (!strcmp(model,"D3100")) { width -= 28; @@ -7895,9 +7961,8 @@ } else if (!strncmp(model,"COOLPIX P",9)) { load_flags = 24; filters = 0x94949494; - // Coolpix P7000 temp patch - if(!strcmp(model,"COOLPIX P7000") && iso_speed >= 400) - black = 256; + if (model[9] == '7' && iso_speed >= 400) + black = 255; } else if (fsize == 1581060) { height = 963; width = 1287; @@ -8009,14 +8074,14 @@ width = 2880; flip = 6; } else if (load_raw != &CLASS packed_load_raw) - maximum = 0x3e00; - if (is_raw == 2 && shot_select) - maximum = 0x2f00; - top_margin = (raw_height - height)/2; - left_margin = (raw_width - width )/2; - if (is_raw == 2) - data_offset += (shot_select > 0) * ( fuji_layout ? - (raw_width *= 2) : raw_height*raw_width*2 ); + maximum = (is_raw == 2 && shot_select) ? 0x2f00 : 0x3e00; + top_margin = (raw_height - height) >> 2 << 1; + left_margin = (raw_width - width ) >> 2 << 1; + if (width == 3328) { + width = 3262; + left_margin = 34; + } + if (fuji_layout) raw_width *= is_raw; if (load_raw == &CLASS fuji_load_raw) { fuji_width = width >> !fuji_layout; width = (height >> fuji_layout) + fuji_width; @@ -8113,24 +8178,28 @@ raw_width = fsize/height/2; order = 0x4d4d; load_raw = &CLASS unpacked_load_raw; - } else if (!strcmp(model,"NX10")) { - height -= top_margin = 4; + } else if (!strncmp(model,"NX1",3)) { + height -= top_margin = 8; width -= 2 * (left_margin = 8); load_flags = 32; } else if (!strcmp(model,"EX1")) { order = 0x4949; - height = 2760; + height -= 20; top_margin = 2; if ((width -= 6) > 3682) { - height = 2750; - width = 3668; + height -= 10; + width -= 46; top_margin = 8; } } else if (!strcmp(model,"WB2000")) { order = 0x4949; height -= 3; - width -= 10; top_margin = 2; + if ((width -= 10) > 3718) { + height -= 28; + width -= 56; + top_margin = 8; + } } else if (fsize == 20487168) { height = 2808; width = 3648; @@ -8234,6 +8303,13 @@ top_margin = 4; left_margin = 41; filters = 0x61616161; + } else if (raw_width == 9044) { + height = 6716; + width = 8964; + top_margin = 8; + left_margin = 40; + black += load_flags = 256; + maximum = 0x8101; } else if (raw_width == 4090) { strcpy (model, "V96C"); height -= (top_margin = 6); @@ -8256,8 +8332,10 @@ if (ljpeg_start (&jh, 1) && jh.bits == 15) maximum = 0x1fff; if (tiff_samples > 1) filters = 0; - if (tiff_samples > 1 || tile_length < raw_height) + if (tiff_samples > 1 || tile_length < raw_height) { load_raw = &CLASS leaf_hdr_load_raw; + raw_width = tile_width; + } if ((width | height) == 2048) { if (tiff_samples == 1) { filters = 1; @@ -8461,7 +8539,7 @@ void CLASS identify2(unsigned fsize, unsigned flen, char *head) { if (!strncasecmp(model,"EasyShare",9)) { - data_offset = 0x15000; + data_offset = data_offset < 0x15000 ? 0x15000 : 0x17000; load_raw = &CLASS packed_load_raw; } else if (!strcasecmp(make,"KODAK")) { if (filters == UINT_MAX) filters = 0x61616161; @@ -8558,7 +8636,8 @@ load_raw = &CLASS kodak_radc_load_raw; filters = 0x61616161; simple_coeff(2); - } else if (!strcmp(model,"QuickTake 100")) { + } else if (!strncmp(model,"QuickTake",9)) { + if (head[5]) strcpy (model+10, "200"); fseek (ifp, 544, SEEK_SET); height = get2(); width = get2(); @@ -8568,14 +8647,6 @@ fseek (ifp, data_offset-6, SEEK_SET); flip = ~get2() & 3 ? 5:6; } - load_raw = &CLASS quicktake_100_load_raw; - filters = 0x61616161; - } else if (!strcmp(model,"QuickTake 150")) { - data_offset = 738 - head[5]; - if (head[5]) strcpy (model+10, "200"); - load_raw = &CLASS kodak_radc_load_raw; - height = 480; - width = 640; filters = 0x61616161; } else if (!strcmp(make,"Rollei") && !load_raw) { switch (raw_width) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/internal/defines.h new/LibRaw-0.13.5/internal/defines.h --- old/LibRaw-0.13.2/internal/defines.h 2011-03-08 16:45:11.000000000 +0100 +++ new/LibRaw-0.13.5/internal/defines.h 2011-05-21 16:46:33.000000000 +0200 @@ -22,7 +22,7 @@ */ #define NO_JPEG -#define VERSION "9.06" +#define VERSION "9.08" #ifndef _GNU_SOURCE #define _GNU_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/libraw/libraw_datastream.h new/LibRaw-0.13.5/libraw/libraw_datastream.h --- old/LibRaw-0.13.2/libraw/libraw_datastream.h 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/libraw/libraw_datastream.h 2011-05-21 16:31:34.000000000 +0200 @@ -52,7 +52,7 @@ public: LibRaw_byte_buffer(unsigned sz=0) { - buf=0; size=sz; offt=0; do_free=0; next_ff=0; + buf=0; size=sz; offt=0; do_free=0; if(size) { buf = (unsigned char*)malloc(size); do_free=1; @@ -67,22 +67,17 @@ void unseek2() { if(offt>=2) offt-=2;} void *get_buffer() { return buf; } int get_ljpeg_byte() { - if(offt<next_ff) return buf[offt++]; - int ret = buf[offt++]; - if(ret == 0xff) { if(buf[offt]==0x00) offt++; else return 0;} - // find next 0xff - unsigned char *p = (unsigned char*) memchr(buf+offt,0xff,size-offt); - if(p) - next_ff = p-buf; - else - next_ff = size; - return ret; + if(offt>=size) return 0; + unsigned char val = buf[offt++]; + if(val!=0xFF || offt >=size || buf[offt++]==0) + return val; + offt -=2; + return 0; } private: unsigned char *buf; - unsigned int size,offt, do_free,next_ff; - + unsigned int size,offt, do_free; }; class LibRaw_bit_buffer @@ -200,7 +195,7 @@ virtual char* gets(char *, int) = 0; virtual int scanf_one(const char *, void *) = 0; virtual int eof() = 0; - // Make buffer from current offset + /* Make buffer from current offset */ virtual LibRaw_byte_buffer *make_byte_buffer(unsigned int sz) { LibRaw_byte_buffer *ret = new LibRaw_byte_buffer(sz); @@ -361,11 +356,12 @@ virtual LibRaw_byte_buffer *make_byte_buffer(unsigned int sz) { LibRaw_byte_buffer *ret = new LibRaw_byte_buffer(0); + if(streampos + sz > streamsize) + sz = streamsize - streampos; ret->set_buffer(buf+streampos,sz); return ret; } - virtual int read(void * ptr,size_t sz, size_t nmemb) { if(substream) return substream->read(ptr,sz,nmemb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/libraw/libraw_types.h new/LibRaw-0.13.5/libraw/libraw_types.h --- old/LibRaw-0.13.2/libraw/libraw_types.h 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/libraw/libraw_types.h 2011-05-21 16:31:34.000000000 +0200 @@ -41,7 +41,7 @@ #else # undef LIBRAW_USE_OPENMP #endif -// Not Win32 +/* Not Win32 */ # elif (defined(__APPLE__) || defined(__MACOSX__)) && defined(_REENTRANT) # undef LIBRAW_USE_OPENMP # else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/libraw/libraw_version.h new/LibRaw-0.13.5/libraw/libraw_version.h --- old/LibRaw-0.13.2/libraw/libraw_version.h 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/libraw/libraw_version.h 2011-05-21 16:31:34.000000000 +0200 @@ -25,11 +25,11 @@ #define LIBRAW_MAJOR_VERSION 0 #define LIBRAW_MINOR_VERSION 13 -#define LIBRAW_PATCH_VERSION 2 +#define LIBRAW_PATCH_VERSION 5 #define LIBRAW_VERSION_TAIL Release #define LIBRAW_SHLIB_CURRENT 2 -#define LIBRAW_SHLIB_REVISION 1 +#define LIBRAW_SHLIB_REVISION 4 #define LIBRAW_SHLIB_AGE 0 #define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LibRaw-0.13.2/src/libraw_cxx.cpp new/LibRaw-0.13.5/src/libraw_cxx.cpp --- old/LibRaw-0.13.2/src/libraw_cxx.cpp 2011-03-08 16:43:31.000000000 +0100 +++ new/LibRaw-0.13.5/src/libraw_cxx.cpp 2011-05-21 16:31:34.000000000 +0200 @@ -1910,7 +1910,9 @@ "Canon EOS 450D / Digital Rebel XSi / Kiss Digital X2", "Canon EOS 500D / Digital Rebel T1i / Kiss Digital X3", "Canon EOS 550D / Digital Rebel T2i / Kiss Digital X4", +"Canon EOS 600D / Digital Rebel T3i / Kiss Digital X5", "Canon EOS 1000D / Digital Rebel XS / Kiss Digital F", +"Canon EOS 1100D / Digital Rebel T3 / Kiss Digital X50", "Canon EOS D2000C", "Canon EOS-1D", "Canon EOS-1DS", @@ -1966,6 +1968,9 @@ "Fuji FinePix S9100/S9600", "Fuji FinePix S200EXR", "Fuji FinePix HS10/HS11", +"Fuji FinePix HS20EXR", +"Fuji FinePix F550EXR", +"Fuji FinePix X100", "Fuji IS-1", "Hasselblad CFV", "Hasselblad H3D", @@ -2012,11 +2017,20 @@ "Kodak P880", "Kodak Z980", "Kodak Z981", +"Kodak Z990", "Kodak Z1015", "Kodak KAI-0340", "Konica KD-400Z", "Konica KD-510Z", "Leaf AFi 7", +"Leaf AFi-II 5", +"Leaf AFi-II 6", +"Leaf AFi-II 7", +"Leaf AFi-II 8", +"Leaf AFi-II 10", +"Leaf AFi-II 10R", +"Leaf AFi-II 12", +"Leaf AFi-II 12R", "Leaf Aptus 17", "Leaf Aptus 22", "Leaf Aptus 54S", @@ -2083,6 +2097,7 @@ "Nikon D3000", "Nikon D3100", "Nikon D5000", +"Nikon D5100", "Nikon D7000", "Nikon E700 ("DIAG RAW" hack)", "Nikon E800 ("DIAG RAW" hack)", @@ -2135,6 +2150,8 @@ "Olympus E-P1", "Olympus E-P2", "Olympus E-PL1", +"Olympus E-PL1s", +"Olympus E-PL2", "Olympus SP310", "Olympus SP320", "Olympus SP350", @@ -2143,6 +2160,7 @@ "Olympus SP550UZ", "Olympus SP560UZ", "Olympus SP570UZ", +"Olympus XZ-1", "Panasonic DMC-FZ8", "Panasonic DMC-FZ18", "Panasonic DMC-FZ28", @@ -2207,6 +2225,7 @@ "Samsung GX10", "Samsung GX20", "Samsung NX10", +"Samsung NX11", "Samsung NX100", "Samsung WB550", "Samsung WB2000", @@ -2230,6 +2249,8 @@ "Sony DSC-V3", "Sony DSLR-A100", "Sony DSLR-A200", +"Sony DSLR-A230", +"Sony DSLR-A290", "Sony DSLR-A300", "Sony DSLR-A330", "Sony DSLR-A350", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org