Hello community,

here is the log from the commit of package darktable for openSUSE:Factory 
checked in at 2013-06-11 06:27:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/darktable (Old)
 and      /work/SRC/openSUSE:Factory/.darktable.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "darktable"

Changes:
--------
--- /work/SRC/openSUSE:Factory/darktable/darktable.changes      2013-06-05 
11:48:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2013-06-11 
09:26:27.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 10 13:07:02 UTC 2013 - tog...@opensuse.org
+
+- added backported patch from git master 
+  0001-fixed-error-handling-for-broken-full-color-images.patch
+  fixes bnc#823114
+ 
+
+-------------------------------------------------------------------

New:
----
  0001-fixed-error-handling-for-broken-full-color-images.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ darktable.spec ++++++
--- /var/tmp/diff_new_pack.kq146p/_old  2013-06-11 09:26:29.000000000 +0200
+++ /var/tmp/diff_new_pack.kq146p/_new  2013-06-11 09:26:29.000000000 +0200
@@ -22,6 +22,8 @@
 Url:            http://darktable.sourceforge.net
 Source0:        
https://downloads.sourceforge.net/project/darktable/darktable/1.2/%name-%version.tar.xz
 Source1:        
http://sourceforge.net/projects/darktable/files/darktable/1.2/darktable-usermanual.pdf
+#PATCH-FIX-UPSTREAM backported from git master bnc#823114
+Patch0:         0001-fixed-error-handling-for-broken-full-color-images.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  dbus-1-glib-devel
@@ -87,6 +89,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
 cp %{S:1} darktable-usermanual.pdf

++++++ 0001-fixed-error-handling-for-broken-full-color-images.patch ++++++
>From 796937043871aadbd0c0dc61bc90ea674ec1bc18 Mon Sep 17 00:00:00 2001
From: Alex Tutubalin <l...@lexa.ru>
Date: Fri, 24 May 2013 23:20:57 +0400
Subject: [PATCH] fixed error handling for broken full-color images

---
 src/external/LibRaw/src/libraw_cxx.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/external/LibRaw/src/libraw_cxx.cpp 
b/src/external/LibRaw/src/libraw_cxx.cpp
index 218460c..977e40a 100644
--- a/src/external/LibRaw/src/libraw_cxx.cpp
+++ b/src/external/LibRaw/src/libraw_cxx.cpp
@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
                 S.iheight= S.height;
                 IO.shrink = 0;
                 // allocate image as temporary buffer, size 
-                imgdata.rawdata.raw_alloc = 
calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
-                imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
+                imgdata.rawdata.raw_alloc = 0;
+                imgdata.image = (ushort (*)[4]) 
calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
             }
 
 
@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
         // recover saved
         if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
             {
-                imgdata.image = 0; 
-                imgdata.rawdata.color_image = (ushort (*)[4]) 
imgdata.rawdata.raw_alloc;
+              imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = 
imgdata.image;
+              imgdata.image = 0; 
             }
 
         // calculate channel maximum
-- 
1.8.3

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to