← Back to branch summary

~ubuntu-branches/ubuntu/saucy/darktable/saucy

« back to all changes in this revision

Viewing changes to debian/patches/0006-Fixed-some-small-things.patch

  • Committer: Bazaar Package Importer
  • Author(s): David Bremner
  • Date: 2011-07-12 09:36:46 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110712093646-yp9dbxan44dmw15h
Tags: 0.9-1
* New upstream release.
* Remove all patches now upstream; only patch for
  -Wno-error=unused-but-set-variable remains.
* Bump Standards-Version to 3.9.2 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0006-Fixed-some-small-things.patch
1
 
From 96f779edff0eb2b425bf19593284c4318d1a4901 Mon Sep 17 00:00:00 2001
2
 
From: Henrik Andersson <hean01@users.sourceforge.net>
3
 
Date: Fri, 22 Apr 2011 10:33:00 +0200
4
 
Subject: [PATCH] Fixed some small things.. (cherry picked from commit
5
 
 b1f2c68a04e576edf377d8069cdf974aa4c6f84e)
6
 
 
7
 
---
8
 
 src/common/darktable.c |   17 +++--------------
9
 
 1 files changed, 3 insertions(+), 14 deletions(-)
10
 
 
11
 
diff --git a/src/common/darktable.c b/src/common/darktable.c
12
 
index 3e928f8..1767cea 100644
13
 
--- a/src/common/darktable.c
14
 
+++ b/src/common/darktable.c
15
 
@@ -109,24 +109,13 @@ void dt_check_cpu(int argc,char **argv)
16
 
   int found=0;
17
 
   strcat(message,_("SIMD extensions found: "));
18
 
   if((cx & 1) && (darktable.cpu_flags |= DT_CPU_FLAG_SSE3))
19
 
-  {
20
 
-    found = 1;
21
 
     strcat(message,"SSE3 ");
22
 
-  }
23
 
   if( ((dx >> 26) & 1) && (darktable.cpu_flags |= DT_CPU_FLAG_SSE2))
24
 
-  {
25
 
-    found = 1;
26
 
     strcat(message,"SSE2 ");
27
 
-  }
28
 
-  else if (((dx >> 25) & 1) && (darktable.cpu_flags |= DT_CPU_FLAG_SSE))
29
 
-  {
30
 
-    found = 1;
31
 
-    strcat(message,"SSE ");
32
 
-  }
33
 
-  if (!found)
34
 
-  {
35
 
+  if (((dx >> 25) & 1) && (darktable.cpu_flags |= DT_CPU_FLAG_SSE))
36
 
+   strcat(message,"SSE ");
37
 
+  if (!darktable.cpu_flags)
38
 
     strcat(message,"none");
39
 
-  }
40
 
  
41
 
   /* for now, bail out if SSE2 is not availble */
42
 
   if(!(darktable.cpu_flags & DT_CPU_FLAG_SSE2))
43
 
1.7.4.4
44