← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monsterz/trusty

« back to all changes in this revision

Viewing changes to debian/patches/010_64-bit-alignment-issues-with-python2.5.diff

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hocevar (Debian packages), Sam Hocevar
  • Date: 2008-05-09 16:33:52 UTC
  • mfrom: (2.1.2 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080509163352-r1kvzi3z8pwohgbm
Tags: 0.7.1-2
http://bugs.debian.org/373905
* Remove deprecated Encoding key from .desktop file

[ Sam Hocevar ]
* debian/control:
  + Use quilt for patch management.

* debian/patches/010_64-bit-alignment-issues-with-python2.5.diff:
  + New patch from upstream. Fix a startup crash on 64-bit systems
    (Closes: #373905).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/010_64-bit-alignment-issues-with-python2.5.diff
 
1
Index: monsterz-0.7.1/monsterz.py
 
2
===================================================================
 
3
--- monsterz-0.7.1.orig/monsterz.py     2008-05-09 16:35:25.000000000 +0000
 
4
+++ monsterz-0.7.1/monsterz.py  2008-05-09 16:35:33.000000000 +0000
 
5
@@ -108,7 +108,9 @@
 
6
                 M = int(max(r, g, b))
 
7
                 m = int(min(r, g, b))
 
8
                 val = (2 * M + r + g + b) / 5
 
9
-                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
 
10
+                p[0] = (val + r) / 2
 
11
+                p[1] = (val + g) / 2
 
12
+                p[2] = (val + b) / 2
 
13
                 if alpha[y][x] >= 250:
 
14
                     alpha[y][x] = 255 - (M - m) * 3 / 4
 
15
         del pixels
 
16
@@ -129,7 +131,9 @@
 
17
                 r, g, b = p
 
18
                 M = int(max(r, g, b))
 
19
                 m = int(min(r, g, b))
 
20
-                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
 
21
+                p[0] = (m + r) / 2
 
22
+                p[1] = (m + g) / 2
 
23
+                p[2] = (m + b) / 2
 
24
                 if alpha[y][x] >= 250:
 
25
                     alpha[y][x] = 255 - M * 2 / 3
 
26
         del pixels