← Back to branch summary

~ubuntu-branches/debian/stretch/darktable/stretch

« back to all changes in this revision

Viewing changes to debian/patches/0001-fixed-error-handling-for-broken-full-color-images.patch

  • Committer: Package Import Robot
  • Author(s): David Bremner
  • Date: 2013-07-28 18:18:54 UTC
  • mfrom: (13.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20130728181854-0ighzoz5nvq0zzoe
Tags: 1.2.2-1
* New upstream "hardware support release"
  - updated rawspeed r553. Support for Canon EOS 700D, Nikon Coolpix
    P330, New Olymbus base curve Updated Adobe Coeffs
  - Enhanced color matrices: Canon 700D (from Canon 650D), Canon 100D
    (from Canon 650D), Sony NEX-7
  - White balance presets: Some updates from UFRaw, Canon 100D, Canon
    700D, Sony SLT-A37 Nikon, Coolpix P330
  - Noise profiles: Canon EOS-M, Olympus E-600 (from: Olympus E-30),
    Olympus E-620 (from: Olympus E-30), Samsung WB2000, Sony A99v,
    Panasonic DMC-G10 iso 100, Nikon D60
  - Bug fixes: 0 star rating working again, LT: ctrl+d duplicates per
    default now, Some fixes concerning locale handling, double click on
    film strip jumps to image, remember position in collections, ctrl+k
    jumps to previous collection, Blending parameters are preserved when
    module is deactivated, In full-preview (alt-1) ratings and labels are
    only applied to image shown, libsquish compilation now optional, dr:
    deactivate interpolation at 200% zoom

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-fixed-error-handling-for-broken-full-color-images.patch
1
 
From 6365dfd4cb9815eed30aa7fc0e537275563c178c Mon Sep 17 00:00:00 2001
2
 
From: Alex Tutubalin <lexa@lexa.ru>
3
 
Date: Fri, 24 May 2013 23:20:57 +0400
4
 
Subject: [PATCH] fixed error handling for broken full-color images
5
 
 
6
 
(cherry picked from commit e792b3c8a0a1c536b8614883b7e0277e6d5eed83)
7
 
---
8
 
 src/external/LibRaw/src/libraw_cxx.cpp |    8 ++++----
9
 
 1 file changed, 4 insertions(+), 4 deletions(-)
10
 
 
11
 
diff --git a/src/external/LibRaw/src/libraw_cxx.cpp b/src/external/LibRaw/src/libraw_cxx.cpp
12
 
index 218460c..977e40a 100644
13
 
--- a/src/external/LibRaw/src/libraw_cxx.cpp
14
 
+++ b/src/external/LibRaw/src/libraw_cxx.cpp
15
 
@@ -796,8 +796,8 @@ int LibRaw::unpack(void)
16
 
                 S.iheight= S.height;
17
 
                 IO.shrink = 0;
18
 
                 // allocate image as temporary buffer, size 
19
 
-                imgdata.rawdata.raw_alloc = calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
20
 
-                imgdata.image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
21
 
+                imgdata.rawdata.raw_alloc = 0;
22
 
+                imgdata.image = (ushort (*)[4]) calloc(S.iwidth*S.iheight,sizeof(*imgdata.image));
23
 
             }
24
 
 
25
 
 
26
 
@@ -807,8 +807,8 @@ int LibRaw::unpack(void)
27
 
         // recover saved
28
 
         if( decoder_info.decoder_flags & LIBRAW_DECODER_LEGACY)
29
 
             {
30
 
-                imgdata.image = 0; 
31
 
-                imgdata.rawdata.color_image = (ushort (*)[4]) imgdata.rawdata.raw_alloc;
32
 
+              imgdata.rawdata.raw_alloc = imgdata.rawdata.color_image = imgdata.image;
33
 
+              imgdata.image = 0; 
34
 
             }
35
 
 
36
 
         // calculate channel maximum
37
 
1.7.10.4
38