Merge lp:~marjinal1st/ubuntu/trusty/python-sfml/bugfix into lp:ubuntu/trusty/python-sfml

Proposed by Ahmet Sezgin DURAN on 2014-12-09
Status: Needs review
Proposed branch: lp:~marjinal1st/ubuntu/trusty/python-sfml/bugfix
Merge into: lp:ubuntu/trusty/python-sfml
Diff against target: 12 lines (+1/-1)
1 file modified
src/sfml/graphics.pyx (+1/-1)
To merge this branch: bzr merge lp:~marjinal1st/ubuntu/trusty/python-sfml/bugfix
Reviewer Review Type Date Requested Status
Brian Murray 2014-12-09 Needs Fixing on 2015-02-10
Review via email: mp+244241@code.launchpad.net

Description of the change

To post a comment you must log in.
Brian Murray (brian-murray) wrote :

It'd be best to put this in a patch in the debian/patches directory using the patch system of the package - quilt.

review: Needs Fixing

Unmerged revisions

14. By Ahmet Sezgin DURAN on 2014-12-09

Updated intersects method

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sfml/graphics.pyx'
2--- src/sfml/graphics.pyx 2013-12-09 17:50:52 +0000
3+++ src/sfml/graphics.pyx 2014-12-09 23:20:39 +0000
4@@ -185,7 +185,7 @@
5 def intersects(self, rectangle):
6 # make sure the rectangle is a rectangle (to get its right/bottom border)
7 l, t, w, h = rectangle
8- rectangle = Rectangle(l, t, w, h)
9+ rectangle = Rectangle((l, t), (w, h))
10
11 # compute the intersection boundaries
12 left = max(self.left, rectangle.left)

Subscribers

People subscribed via source and target branches