pool/darktable
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 158644 from graphics

Browse Source 
- Update to release 1.1.4 This is bugfix release no new features
  are introduced.
  * Fix tooltip style definition in darktable.gtkrc.
  * colorspaces: avoid trademark issues
  * colorspaces: workaround horrible brokenness of some printshops
  * colorspaces: actually cprt is a required icc tag
  * thumbs: use mip always > image size, not closest.
  * wb_presets: Nikon D3200 (stolen from UFRaw)
  * wb_presets: SONY SLT-A77V
  * wb_presets: Panasonic DMC-G5 (thanks to thouks)
  * wb_presets: Pentax K-5 II s (thanks to Jack Bowling)
  * wb_presets: Nikon D800(E) update
  * rawspeed: minor fix for LX7 in 3:2 mode
  * rawspeed: support Panasonic DMC-LX7 16:9 and 1:1 aspect ratio modes
  * rawspeed: support Panasonic DMC-LX7 3:2 aspect ratio mode
  * rawspeed: Preliminary support for the PENTAX K-5 II s
  * rawspeed: added Panasonic DMC-G5 1:1/16:9 modes
  * rawspeed: Nikon 1 S1 support
  * rawspeed: Nikon 1 J3 support
  * rawspeed: Nikon Coolpix P7100 blackpoint fix (thanks to nesthib)
  * Fix base curve presets for Canon on Spanish locale
  * Fix #9205: Read metadata from non-dt XMPs
  * blend: fix edge case in color blend mode
  * redraw: remove now obsolete flood stopping.
  * redraw: allow more redraws per second.
  * redraw signal: simplify the locking logic somewhat.
  * pack blendif settings a little bit closer in GUI
  * cache: have full buffers according to potentially exporting  threads
  * lens correction: fix for #9270
  * opencl: work around a bug in some OpenCL drivers (forwarded request 158643 from toganm)

OBS-URL: https://build.opensuse.org/request/show/158644
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2013-03-12 13:58:28 +00:00 committed by Git OBS Bridge
parent c072e75a34
commit b5a7d4cba0
6 changed files with 78 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch Normal file
View File

@ -0,0 +1,30 @@
>From 47bdab232b382efb89881e79491b7f2c9dbd3ead Mon Sep 17 00:00:00 2001
From: hal <hal.from.2001@gmail.com>
Date: Sun, 10 Mar 2013 22:56:33 +0100
Subject: [PATCH] Fix: svg uses premultiplied alpha, we didn't respect this.
---
src/iop/watermark.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/iop/watermark.c b/src/iop/watermark.c
index 3b8fad7..e30936a 100644
--- a/src/iop/watermark.c
+++ b/src/iop/watermark.c
@@ -645,9 +645,10 @@ void process (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, void
for(int j=0; j<roi_out->height; j++) for(int i=0; i<roi_out->width; i++)
{
float alpha = (sd[3]/255.0)*opacity;
- out[0] = ((1.0-alpha)*in[0]) + (alpha*(sd[2]/255.0));
- out[1] = ((1.0-alpha)*in[1]) + (alpha*(sd[1]/255.0));
- out[2] = ((1.0-alpha)*in[2]) + (alpha*(sd[0]/255.0));
+ /* svg uses a premultiplied alpha, so only use opacity for the blending */
+ out[0] = ((1.0-alpha)*in[0]) + (opacity*(sd[2]/255.0));
+ out[1] = ((1.0-alpha)*in[1]) + (opacity*(sd[1]/255.0));
+ out[2] = ((1.0-alpha)*in[2]) + (opacity*(sd[0]/255.0));
out[3] = in[3];
out+=ch;
--
1.7.10.4

26
0001-Olympus-E-M5-enhanced-matrix.patch
View File

@ -1,26 +0,0 @@
From 746f465a402c8d4bf36b0dcf897d7103448710fc Mon Sep 17 00:00:00 2001
From: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Date: Sun, 10 Feb 2013 17:20:40 +0100
Subject: [PATCH] Olympus E-M5 enhanced matrix with help from Frederic Crozat
---
src/common/colormatrices.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/common/colormatrices.c b/src/common/colormatrices.c
index fe0fbf0..1f3417f 100644
--- a/src/common/colormatrices.c
+++ b/src/common/colormatrices.c
@@ -204,6 +204,9 @@ static dt_profiled_colormatrix_t dt_profiled_colormatrices[] =
// Eugene Kraf, Wolf Faust IT8, direct sunlight, well lit
{ "OLYMPUS E-PL2", { 785522, 280624, 28503}, { 322266, 1211975, -305984}, { 82550, -246841, 1278198}, {731506, 752808, 645309}},
+ // Frederic Crozat, Wolf Faust IT8, direct sunlight, well lit
+ { "OLYMPUS E-M5", { 937775, 279129, 75378}, { 232697, 1345169, -493317}, { 62012, -354202, 1458389}, {722229, 755142, 623749}},
+
// Karl Mikaelsson, Homebrew ColorChecker, strobe, well lit
{ "OLYMPUS E-500", { 925171, 247681, 26367}, { 257187, 1270187, -455826}, {-87784, -426529, 1383041}, {790421, 812775, 708054}},
--
1.8.1.2

3
darktable-1.1.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9d26f3ca1ae8f833f00f12b3e927cdc807cd3662c5ea8d1c0c55fe4555cfaf9
size 2226896

3
darktable-1.1.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb6bc7d5a672b1b493921e80aae8cff2a94e66da7acee9e2cdbd83fa11ececaf
size 2231272

42
darktable.changes
View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Sun Mar 10 18:15:03 UTC 2013 - toganm@opensuse.org
- Update to release 1.1.4 This is bugfix release no new features
are introduced.
* Fix tooltip style definition in darktable.gtkrc.
* colorspaces: avoid trademark issues
* colorspaces: workaround horrible brokenness of some printshops
* colorspaces: actually cprt is a required icc tag
* thumbs: use mip always > image size, not closest.
* wb_presets: Nikon D3200 (stolen from UFRaw)
* wb_presets: SONY SLT-A77V
* wb_presets: Panasonic DMC-G5 (thanks to thouks)
* wb_presets: Pentax K-5 II s (thanks to Jack Bowling)
* wb_presets: Nikon D800(E) update
* rawspeed: minor fix for LX7 in 3:2 mode
* rawspeed: support Panasonic DMC-LX7 16:9 and 1:1 aspect ratio modes
* rawspeed: support Panasonic DMC-LX7 3:2 aspect ratio mode
* rawspeed: Preliminary support for the PENTAX K-5 II s
* rawspeed: added Panasonic DMC-G5 1:1/16:9 modes
* rawspeed: Nikon 1 S1 support
* rawspeed: Nikon 1 J3 support
* rawspeed: Nikon Coolpix P7100 blackpoint fix (thanks to nesthib)
* Fix base curve presets for Canon on Spanish locale
* Fix #9205: Read metadata from non-dt XMPs
* blend: fix edge case in color blend mode
* redraw: remove now obsolete flood stopping.
* redraw: allow more redraws per second.
* redraw signal: simplify the locking logic somewhat.
* pack blendif settings a little bit closer in GUI
* cache: have full buffers according to potentially exporting threads
* lens correction: fix for #9270
* opencl: work around a bug in some OpenCL drivers
* exif: return correct buffer length, patch by wolfgang goetz
* match leica basecurve less selectively
* Olympus E-M5 enhanced matrix with help from Frederic Crozat
* ICC profile handling: catch certain mal-formatted profiles
- Added 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch
- Remove 0001-Olympus-E-M5-enhanced-matrix.patch as it's upstreamed
-------------------------------------------------------------------
Sun Feb 10 18:19:50 UTC 2013 - fcrozat@suse.com

6
darktable.spec
View File

@ -17,13 +17,13 @@
Name: darktable
Version: 1.1.3
Version: 1.1.4
Release: 0
Url: http://darktable.sourceforge.net
Source0: https://downloads.sourceforge.net/project/darktable/darktable/1.1/darktable-%{version}.tar.xz
Source1: http://downloads.sourceforge.net/project/darktable/darktable/1.1/darktable-usermanual-1.1.2.pdf
# PATCH-FIX-UPSTREAM 0001-Olympus-E-M5-enhanced-matrix.patch fcrozat@suse.com -- enhanced matrix for Olympus OM-D E-M5
Patch0: 0001-Olympus-E-M5-enhanced-matrix.patch
# PATCH-FIX-UPSTREAM 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch Max Killer <hal.from.2001@gmail.com>
Patch0: 0001-Fix-svg-uses-premultiplied-alpha-we-didn-t-respect-t.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
BuildRequires: dbus-1-glib-devel