Merge lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions into lp:python-ubuntu-platform-api

Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions
Merge into: lp:python-ubuntu-platform-api
Diff against target: 21 lines (+4/-4)
1 file modified
upa/_mir.cpp (+4/-4)
To merge this branch: bzr merge lp:~mzanetti/python-ubuntu-platform-api/fix-resolutions
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+189320@code.launchpad.net

Commit message

fix screen sizes for devices other than mako

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'upa/_mir.cpp'
--- upa/_mir.cpp 2013-10-03 23:13:50 +0000
+++ upa/_mir.cpp 2013-10-04 13:55:27 +0000
@@ -48,14 +48,14 @@
48 if (strcmp(device, "mako\n") == 0) {48 if (strcmp(device, "mako\n") == 0) {
49 res_x = 768;49 res_x = 768;
50 res_y = 1280;50 res_y = 1280;
51 } else if (strcmp(device, "maguro\n") == 0) {
52 res_x = 720;
53 res_y = 1280;
51 } else if (strcmp(device, "manta\n") == 0) {54 } else if (strcmp(device, "manta\n") == 0) {
52 res_x = 720;
53 res_y = 1200;
54 } else if (strcmp(device, "maguro\n") == 0) {
55 res_x = 2560;55 res_x = 2560;
56 res_y = 1600;56 res_y = 1600;
57 } else if (strcmp(device, "grouper\n") == 0) {57 } else if (strcmp(device, "grouper\n") == 0) {
58 res_x = 768;58 res_x = 800;
59 res_y = 1280;59 res_y = 1280;
60 }60 }
6161

Subscribers

People subscribed via source and target branches