pool/darktable
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102a571d04
darktable/update-curves.patch
Stephan Kulow 102a571d04 Accepting request 130015 from graphics 
- Add update-curves.patch: add additional basecurves for Olympus
  E-M5 and EOS 5D Mark II/III and Nikon Dxxxx (from git) (forwarded request 130014 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/130015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=17
2012-08-07 06:04:21 +00:00

195 lines
12 KiB
Diff
Raw Blame History

From 9d264c6c74c85a86943fd29babecb682d0d589e8 Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
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 <pmjdebruijn@pcode.nl>
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 <pmjdebruijn@pcode.nl>
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 <pmjdebruijn@pcode.nl>
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 <pmjdebruijn@pcode.nl>
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 <pmjdebruijn@pcode.nl>
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
Reference in New Issue View Git Blame Copy Permalink