Geis

Merge lp:~bregma/geis/lp-1477243 into lp:geis

  1. lp-1477243
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 334
Merged at revision: 334
Proposed branch: lp:~bregma/geis/lp-1477243
Merge into: lp:geis
Diff against target: 12 lines (+1/-1)
1 file modified
libgeis/backend/grail/geis_grail_backend.c (+1/-1)
To merge this branch: bzr merge lp:~bregma/geis/lp-1477243
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+265736@code.launchpad.net

Commit message

fix a pasto in the grail slice update code

Description of the change

Fix a pasto in the grail slice update code in which the X coord of a slice is updated with the x and y deltas in a frame and the y coord not updated at all.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:334
http://jenkins.qa.ubuntu.com/job/geis-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/18/rebuild

review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Looks sane.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgeis/backend/grail/geis_grail_backend.c'
2--- libgeis/backend/grail/geis_grail_backend.c 2013-11-25 02:19:57 +0000
3+++ libgeis/backend/grail/geis_grail_backend.c 2015-07-23 20:49:03 +0000
4@@ -423,7 +423,7 @@
5 slice_state->angle = 0.0f;
6 slice_state->position_x = grail_slice_get_original_center_x(slice) +
7 (*C)[0][2];
8- slice_state->position_x = grail_slice_get_original_center_x(slice) +
9+ slice_state->position_y = grail_slice_get_original_center_y(slice) +
10 (*C)[1][2];
11 slice_state->radius = 1.0f;
12 slice_state->num_touches = grail_slice_get_num_touches(slice);

Subscribers

People subscribed via source and target branches