diff --git a/darktable-1.0.5.tar.gz b/darktable-1.0.5.tar.gz deleted file mode 100644 index d0fceb3..0000000 --- a/darktable-1.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd -size 2568221 diff --git a/darktable-1.1.tar.gz b/darktable-1.1.tar.gz new file mode 100644 index 0000000..a0629fb --- /dev/null +++ b/darktable-1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f2401422ab3e0bb038b3fedf411aaf69994d679674757ee7886b6146b9fdd4f +size 3423644 diff --git a/darktable-usermanual.pdf b/darktable-usermanual.pdf new file mode 100644 index 0000000..2f2ced8 --- /dev/null +++ b/darktable-usermanual.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:493f40f313d40eebd42457e6a9f6580bc278334421ed8c828b983930aa7a42f7 +size 7242334 diff --git a/darktable.changes b/darktable.changes index 8dd4e00..f1e7272 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Tue Nov 27 07:56:26 UTC 2012 - toganm@opensuse.org + +- Update to release 1.1 + * general + + new camera support, new whitebalance presets, etc., including + canon eos m support and samsung nx fix + + similarity matching search for images that look alike. + + geotagging, complete with map view + + a lot of bugfixes (mainly thanks to ulrich for his meticulous + work) + + facebook exporter (for those who have an account there) + * ui + + reworked the much hated `more plugins' widget + + image grouping: + + command line interface! + + tone and base curves got a new user interface to better + support fine grained workflow + + visually low-profile controls with finetuning: + + color correction module got a GUI update since the blog post + (two circles indicating shadows and highlights instead of the + quad). + + live view for tethered shooting! + * darkroom + + extensive use of edge-aware filtering techniques to suppress + noise, halos and ringing all around darktable: + + conditional blending, and a lot of goodies around it! + + magenta highlights: high-contrast edges to overexposed areas + (should get rid of purple highlights on tiny water waves and + purple fringes around tree leaves for example) + + much improved sharpness for both export and darkroom view, + especially for downsampled images and if you use lens + corrections or rotations/perspective corrections. check the new + options in the preferences dialog, also one more than mentioned + in the blog ("demosaicing for zoomed out darkroom mode" to + trade performance for even more sharpness): + * color management + + improved per-screen color management (should reload the + screen profile automatically) + + more compatible embedded color profiles (should fix problems + on windows viewing our images, if that matters) read embedded + color profiles from jpg + * opencl + + most of our modules now can take advantage of your computer's + gpu power + + caching for compiled opencl kernels (even in case the driver + doesn't do it) for faster startup times + * translations + + two new translations (both portuguese.. ;) ) + + well translated: cs de es fr it ja nl pl pt_BR pt_PT sv + + half translated: ca fi gl ro ru sq th zh_CN + +- Packaging related : + * Provide the pdf documentation + * Remove backported patches as they are part of the package now + + rsvg_cairo.patch + + update-curves.patch + * provide tool to work with database cleanup + purge_non_existing_images.sh (placed in documentation + directory) + * where possible use pkgconfig variables for buildrequires + ------------------------------------------------------------------- Tue Oct 9 10:40:40 UTC 2012 - toganm@opensuse.org @@ -23,18 +85,18 @@ Tue Jul 24 10:05:20 UTC 2012 - toganm@opensuse.org Nikon D3200, Nikon D4, Nikon D800, Olympus E-M5, Panasonic GF5, Sony SLT-A37/A57, Leica X1/X2, Sony DSC-RX100 + A few memory leaks were resolved - + A few generic bugs were resolved + + A few generic bugs were resolved - use -DLENSFUN_INCLUDE_DIR to fix finding lensfun.h ------------------------------------------------------------------- Thu Jun 14 12:59:00 UTC 2012 - toganm@opensuse.org -- Disable build for powerppc as darktable requires sse instructions +- Disable build for powerppc as darktable requires sse instructions ------------------------------------------------------------------- Mon Jun 4 08:21:28 UTC 2012 - toganm@opensuse.org -- Enabled all plugins +- Enabled all plugins ------------------------------------------------------------------- Sun Jun 3 12:23:42 UTC 2012 - meissner@suse.com @@ -60,7 +122,7 @@ Sat Apr 28 06:48:17 UTC 2012 - toganm@opensuse.org * New subtle denoise preset for equalizer * Various build fixes * Numerous other fixes - + ------------------------------------------------------------------- Thu Mar 15 07:52:17 UTC 2012 - toganm@opensuse.org @@ -79,7 +141,7 @@ Thu Mar 15 07:52:17 UTC 2012 - toganm@opensuse.org * Canon EOS 1000D * Canon EOS 600D * Sony Alpha 390 - * Fuji Finepix HS20EXR + * Fuji Finepix HS20EXR + new and updated translations (we now have chinese!) + new image cache * faster concurrent access and insertion @@ -143,7 +205,7 @@ Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de ------------------------------------------------------------------- Tue Sep 13 22:36:51 UTC 2011 - toganm@opensuse.org -- Added dbus-1-glib-devel to BuildRequires +- Added dbus-1-glib-devel to BuildRequires ------------------------------------------------------------------- Sat Sep 3 13:13:43 UTC 2011 - toganm@opensuse.org @@ -161,7 +223,7 @@ Sat Sep 3 13:13:43 UTC 2011 - toganm@opensuse.org ------------------------------------------------------------------- Tue Jul 26 07:14:25 UTC 2011 - toganm@opensuse.org -- Updated to bugfix release 0.9.1 +- Updated to bugfix release 0.9.1 + new rawspeed, dcraw, libraw + fixed various segfaults and deadlocks + the pipeline is now more real HDR (no more gamut clipping in @@ -218,7 +280,7 @@ Fri Jun 10 13:39:01 UTC 2011 - fcrozat@suse.com ------------------------------------------------------------------- Thu Mar 3 23:20:59 UTC 2011 - toganm@opensuse.org -- Fix building for x86_64 +- Fix building for x86_64 ------------------------------------------------------------------- Wed Feb 23 16:45:28 UTC 2011 - fcrozat@novell.com @@ -244,7 +306,7 @@ Wed Feb 23 16:45:28 UTC 2011 - fcrozat@novell.com ------------------------------------------------------------------- Mon Dec 13 13:53:26 UTC 2010 - fcrozat@novell.com -- Release 0.7.1 : +- Release 0.7.1 : * some more white balance presets * layout fixes for overlong profile names * styles now actually work @@ -258,4 +320,3 @@ Tue Nov 23 16:04:01 UTC 2010 - bitshuffler@opensuse.org Wed Sep 1 17:52:38 UTC 2010 - bitshuffler@opensuse.org - Initial package - diff --git a/darktable.spec b/darktable.spec index fd85f02..50fa64f 100644 --- a/darktable.spec +++ b/darktable.spec @@ -17,36 +17,38 @@ Name: darktable -Version: 1.0.5 +Version: 1.1 Release: 0 Url: http://darktable.sourceforge.net Source0: https://downloads.sourceforge.net/project/darktable/darktable/1.0/darktable-%{version}.tar.gz -Patch0: update-curves.patch -# PATCH-FIX-UPSTREAM Tobias Ellinghaus me@houz.org -- rsvg_cairo.patch fix build for deprecated use of librsvg error -Patch1: rsvg_cairo.patch +Source1: http://downloads.sourceforge.net/project/darktable/darktable/1.1/darktable-usermanual.pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: Mesa-devel -BuildRequires: OpenEXR-devel BuildRequires: cmake BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gnome-keyring-devel -BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: lensfun-devel -BuildRequires: libcurl-devel -BuildRequires: libexiv2-devel -BuildRequires: libflickcurl-devel -BuildRequires: libglade2-devel -BuildRequires: libgphoto2-devel BuildRequires: libjpeg-devel -BuildRequires: liblcms2-devel -BuildRequires: librsvg-devel BuildRequires: libtiff-devel +BuildRequires: libxslt BuildRequires: pkg-config -BuildRequires: sqlite3-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(OpenEXR) +BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(dri) +BuildRequires: pkgconfig(exiv2) +BuildRequires: pkgconfig(flickcurl) +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(json-glib-1.0) +BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libglade-2.0) +BuildRequires: pkgconfig(libgphoto2) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(sqlite3) ExclusiveArch: %ix86 x86_64 Summary: A virtual Lighttable and Darkroom @@ -54,31 +56,30 @@ License: GPL-3.0+ Group: Productivity/Graphics/Viewers %description -darktable is a virtual lighttable and darkroom for photographers: it manages -your digital negatives in a database and lets you view them through a zoomable +darktable is a virtual lighttable and darkroom for photographers: it manages +your digital negatives in a database and lets you view them through a zoomable lighttable. it also enables you to develop raw images and enhance them. %prep %setup -q -%patch0 -p1 -%if 0%{?suse_version} > 1220 -%patch1 -p1 -%endif +chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh +cp %{S:1} . +%{__rm} data/js/.DS_Store %build [ ! -d "build" ] && mkdir build cd build -export CXXFLAGS="%{optflags} -fno-strict-aliasing " +export CXXFLAGS="%{optflags} -fno-strict-aliasing " export CFLAGS="$CXXFLAGS" cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL=%{_lib} \ -DCMAKE_BUILD_TYPE=Release \ -DBINARY_PACKAGE_BUILD=1 \ - -DLENSFUN_INCLUDE_DIR=%_includedir/lensfun \ - -DINSTALL_IOP_EXPERIMENTAL=On .. + -DUSE_XMLLINT=OFF \ + -DINSTALL_IOP_EXPERIMENTAL=On .. %__make %{_smp_mflags} VERBOSE=1 %install @@ -96,9 +97,10 @@ find %{buildroot}%{_libdir} -name "*.la" -delete %files -f darktable.lang %defattr(-,root,root) -%doc doc/AUTHORS doc/TODO doc/LICENSE +%doc doc/AUTHORS doc/TODO doc/LICENSE darktable-usermanual.pdf tools/purge_non_existing_images.sh tools/create_control_svg.sh %{_bindir}/darktable %{_bindir}/darktable-cltest +%{_bindir}/darktable-cli %{_libdir}/darktable %{_datadir}/applications/darktable.desktop %{_datadir}/darktable diff --git a/rsvg_cairo.patch b/rsvg_cairo.patch deleted file mode 100644 index d9253bb..0000000 --- a/rsvg_cairo.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 343df29553a126f29b5379fefeb7c2cfd1adc073 -Author: Tobias Ellinghaus -Date: Sat Sep 15 11:53:25 2012 +0200 - - Hopefully fix #8931 with an ugly hack - ---- - src/iop/watermark.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/src/iop/watermark.c -+++ b/src/iop/watermark.c -@@ -38,7 +38,10 @@ - #include - - #include -+// ugh, ugly hack. why do people break stuff all the time? -+#ifndef RSVG_CAIRO_H - #include -+#endif - - #include "common/metadata.h" - #include "common/utility.h" -@@ -708,7 +711,7 @@ static void refresh_watermarks( dt_iop_m - snprintf(filename, 2048, "%s/%s", configdir, d_name); - gtk_combo_box_append_text( g->combobox1, d_name ); - count++; -- } -+ } - g_dir_close(dir) ; - } - diff --git a/update-curves.patch b/update-curves.patch deleted file mode 100644 index 4f4d2c7..0000000 --- a/update-curves.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 9d264c6c74c85a86943fd29babecb682d0d589e8 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sat, 28 Jul 2012 15:02:33 +0200 -Subject: [PATCH 1/6] alternate Canon EOS 5D Mark II/III/IV? basecurve - ---- - src/iop/basecurve.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index 4bf832f..bf8dd76 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -50,6 +50,7 @@ dt_iop_basecurve_params_t; - - static const char dark_contrast[] = N_("dark contrast"); - static const char canon_eos[] = N_("canon eos like"); -+static const char canon_eos_alt[] = N_("canon eos like alternate"); - static const char nikon[] = N_("nikon like"); - static const char sony_alpha[] = N_("sony alpha like"); - static const char pentax[] = N_("pentax like"); -@@ -79,6 +80,8 @@ static const basecurve_preset_t basecurve_presets[] = - {dark_contrast, "", "", 0, 51200, {{0.000000, 0.072581, 0.157258, 0.491935, 0.758065, 1.000000}, {0.000000, 0.040000, 0.138710, 0.491935, 0.758065, 1.000000}, 0}, 0}, - // pascals canon eos curve (well tested): - {canon_eos, "Canon", "", 0, 51200, {{0.000000, 0.028226, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, -+ // pascals alternate canon eos curve for 5D Mark II and III and potentially a future IV -+ {canon_eos_alt, "Canon", "5D Mark ", 0, 51200, {{0.000000, 0.032258, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals nikon curve (new curve, needs testing): - {nikon, "NIKON", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, - // pascals sony alpha curve (needs testing): --- -1.7.10.4 - - -From d1640b05ee23e0d461aaabed7783619cc37456c6 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sat, 28 Jul 2012 15:21:29 +0200 -Subject: [PATCH 2/6] alternate Olypus E-M5 basecurve - ---- - src/iop/basecurve.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index bf8dd76..5cdd345 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -55,6 +55,7 @@ static const char nikon[] = N_("nikon like"); - static const char sony_alpha[] = N_("sony alpha like"); - static const char pentax[] = N_("pentax like"); - static const char olympus[] = N_("olympus like"); -+static const char olympus_alt[] = N_("olympus like alternate"); - static const char panasonic[] = N_("panasonic like"); - static const char leica[] = N_("leica like"); - static const char kodak_easyshare[] = N_("kodak easyshare like"); -@@ -90,6 +91,8 @@ static const basecurve_preset_t basecurve_presets[] = - {pentax, "PENTAX", "", 0, 51200, {{0.000000, 0.032258, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, - // pascals olympus curve (needs testing): - {olympus, "OLYMPUS", "", 0, 51200, {{0.000000, 0.012097, 0.116935, 0.556452, 0.899194, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, -+ // pascals alternate olympus curve for E-M5 -+ {olympus_alt, "OLYMPUS", "E-M5", 0, 51200, {{0.000000, 0.012097, 0.088710, 0.254032, 0.487903, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, - // pascals panasonic/leica curves (needs testing): - {panasonic, "Panasonic", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, - {leica, "Leica Camera AG", "", 0, 51200, {{0.000000, 0.0362901, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, --- -1.7.10.4 - - -From e829b2847cb8c8093865aa964b1a2e6ca0a6a182 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sat, 28 Jul 2012 15:37:11 +0200 -Subject: [PATCH 3/6] alternate Nikon Dxxxx basecurve - ---- - src/iop/basecurve.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index 5cdd345..75d832e 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -52,6 +52,7 @@ static const char dark_contrast[] = N_("dark contrast"); - static const char canon_eos[] = N_("canon eos like"); - static const char canon_eos_alt[] = N_("canon eos like alternate"); - static const char nikon[] = N_("nikon like"); -+static const char nikon_alt[] = N_("nikon like alternate"); - static const char sony_alpha[] = N_("sony alpha like"); - static const char pentax[] = N_("pentax like"); - static const char olympus[] = N_("olympus like"); -@@ -85,6 +86,8 @@ static const basecurve_preset_t basecurve_presets[] = - {canon_eos_alt, "Canon", "5D Mark ", 0, 51200, {{0.000000, 0.032258, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals nikon curve (new curve, needs testing): - {nikon, "NIKON", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, -+ // pascals alternate nikon curve for (four digit) Nikon Dxxxx models -+ {nikon_alt, "NIKON", "D____", 0, 51200, {{0.000000, 0.001000, 0.056452, 0.358871, 0.717742, 1.000000}, {0.000000, 0.000010, 0.074871, 0.646775, 0.955242, 1.000000}, 0}, 1}, - // pascals sony alpha curve (needs testing): - {sony_alpha, "SONY", "", 0, 51200, {{0.000000, 0.031949, 0.105431, 0.434505, 0.855738, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, - // pascals pentax curve (needs testing): --- -1.7.10.4 - - -From f631ddc2193ad96c9906dc9149bacfeeedc841f9 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sat, 28 Jul 2012 18:33:29 +0200 -Subject: [PATCH 4/6] Disable new basecurves by default - ---- - src/iop/basecurve.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index 75d832e..285d429 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -83,11 +83,11 @@ static const basecurve_preset_t basecurve_presets[] = - // pascals canon eos curve (well tested): - {canon_eos, "Canon", "", 0, 51200, {{0.000000, 0.028226, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals alternate canon eos curve for 5D Mark II and III and potentially a future IV -- {canon_eos_alt, "Canon", "5D Mark ", 0, 51200, {{0.000000, 0.032258, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, -+ {canon_eos_alt, "Canon", "DISABLED", 0, 51200, {{0.000000, 0.032258, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals nikon curve (new curve, needs testing): - {nikon, "NIKON", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, - // pascals alternate nikon curve for (four digit) Nikon Dxxxx models -- {nikon_alt, "NIKON", "D____", 0, 51200, {{0.000000, 0.001000, 0.056452, 0.358871, 0.717742, 1.000000}, {0.000000, 0.000010, 0.074871, 0.646775, 0.955242, 1.000000}, 0}, 1}, -+ {nikon_alt, "NIKON", "DISABLED", 0, 51200, {{0.000000, 0.001000, 0.056452, 0.358871, 0.717742, 1.000000}, {0.000000, 0.000010, 0.074871, 0.646775, 0.955242, 1.000000}, 0}, 1}, - // pascals sony alpha curve (needs testing): - {sony_alpha, "SONY", "", 0, 51200, {{0.000000, 0.031949, 0.105431, 0.434505, 0.855738, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, - // pascals pentax curve (needs testing): -@@ -95,7 +95,7 @@ static const basecurve_preset_t basecurve_presets[] = - // pascals olympus curve (needs testing): - {olympus, "OLYMPUS", "", 0, 51200, {{0.000000, 0.012097, 0.116935, 0.556452, 0.899194, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, - // pascals alternate olympus curve for E-M5 -- {olympus_alt, "OLYMPUS", "E-M5", 0, 51200, {{0.000000, 0.012097, 0.088710, 0.254032, 0.487903, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, -+ {olympus_alt, "OLYMPUS", "DISABLED", 0, 51200, {{0.000000, 0.012097, 0.088710, 0.254032, 0.487903, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, - // pascals panasonic/leica curves (needs testing): - {panasonic, "Panasonic", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, - {leica, "Leica Camera AG", "", 0, 51200, {{0.000000, 0.0362901, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, --- -1.7.10.4 - - -From 46f1ccede3d6a1db5545a724a68e57c7af85b082 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sun, 5 Aug 2012 14:39:43 +0200 -Subject: [PATCH 5/6] Updated new alternate olympus basecurve (with help from - Frederic Crozat) - ---- - src/iop/basecurve.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index 285d429..abcf81c 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -95,7 +95,7 @@ static const basecurve_preset_t basecurve_presets[] = - // pascals olympus curve (needs testing): - {olympus, "OLYMPUS", "", 0, 51200, {{0.000000, 0.012097, 0.116935, 0.556452, 0.899194, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, - // pascals alternate olympus curve for E-M5 -- {olympus_alt, "OLYMPUS", "DISABLED", 0, 51200, {{0.000000, 0.012097, 0.088710, 0.254032, 0.487903, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, -+ {olympus_alt, "OLYMPUS", "DISABLED", 0, 51200, {{0.000000, 0.012097, 0.072581, 0.310484, 0.645161, 1.000000}, {0.000000, 0.010322, 0.167742, 0.711291, 0.956855, 1.000000}, 0}, 1}, - // pascals panasonic/leica curves (needs testing): - {panasonic, "Panasonic", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, - {leica, "Leica Camera AG", "", 0, 51200, {{0.000000, 0.0362901, 0.120968, 0.205645, 0.604839, 1.000000}, {0.000000, 0.024596, 0.166419, 0.328527, 0.790171, 1.000000}, 0}, 1}, --- -1.7.10.4 - - -From 5c11a5b27ec3eaa1ff38316d430037ddf9f3af52 Mon Sep 17 00:00:00 2001 -From: Pascal de Bruijn -Date: Sun, 5 Aug 2012 14:43:21 +0200 -Subject: [PATCH 6/6] Updated new alternate canon 5d mark ii(i) basecurve - ---- - src/iop/basecurve.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/iop/basecurve.c b/src/iop/basecurve.c -index abcf81c..a8f933e 100644 ---- a/src/iop/basecurve.c -+++ b/src/iop/basecurve.c -@@ -83,7 +83,7 @@ static const basecurve_preset_t basecurve_presets[] = - // pascals canon eos curve (well tested): - {canon_eos, "Canon", "", 0, 51200, {{0.000000, 0.028226, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals alternate canon eos curve for 5D Mark II and III and potentially a future IV -- {canon_eos_alt, "Canon", "DISABLED", 0, 51200, {{0.000000, 0.032258, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, -+ {canon_eos_alt, "Canon", "DISABLED", 0, 51200, {{0.000000, 0.026210, 0.108871, 0.350806, 0.669355, 1.000000}, {0.000000, 0.029677, 0.232258, 0.747581, 0.967742, 1.000000}, 0}, 1}, - // pascals nikon curve (new curve, needs testing): - {nikon, "NIKON", "", 0, 51200, {{0.000000, 0.036290, 0.120968, 0.459677, 0.858871, 1.000000}, {0.000000, 0.036532, 0.228226, 0.759678, 0.983468, 1.000000}, 0}, 1}, - // pascals alternate nikon curve for (four digit) Nikon Dxxxx models --- -1.7.10.4 -