Mir

Merge lp:~vanvugt/mir/remove-pointless-MirPixelFormat-casts into lp:mir

  1. remove-pointless-MirPixelFormat-casts
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 1306
Proposed branch: lp:~vanvugt/mir/remove-pointless-MirPixelFormat-casts
Merge into: lp:mir
Diff against target: 26 lines (+2/-3)
2 files modified
src/client/mir_surface.cpp (+1/-2)
src/server/frontend/surface.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/remove-pointless-MirPixelFormat-casts
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Robert Carr (community) Approve
Andreas Pokorny (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+200280@code.launchpad.net

Commit message

Eliminate unnecessary casts, which should have been done in LP: #1110115

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

PASSED: Continuous integration, rev:1306
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/591/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/317
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/317/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/320
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/320/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/138
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/165
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2649

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/591/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andreas Pokorny (andreas-pokorny) :
review: Approve
Revision history for this message
Robert Carr (robertcarr) :
review: Approve
Revision history for this message
Kevin DuBois (kdub) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/mir_surface.cpp'
2--- src/client/mir_surface.cpp 2013-12-18 02:19:19 +0000
3+++ src/client/mir_surface.cpp 2014-01-02 08:16:11 +0000
4@@ -126,8 +126,7 @@
5 region_out.width = secured_region->width.as_uint32_t();
6 region_out.height = secured_region->height.as_uint32_t();
7 region_out.stride = secured_region->stride.as_uint32_t();
8- region_out.pixel_format = static_cast<MirPixelFormat>(secured_region->format);
9-
10+ region_out.pixel_format = secured_region->format;
11 region_out.vaddr = secured_region->vaddr.get();
12 }
13
14
15=== modified file 'src/server/frontend/surface.cpp'
16--- src/server/frontend/surface.cpp 2013-12-18 02:19:19 +0000
17+++ src/server/frontend/surface.cpp 2014-01-02 08:16:11 +0000
18@@ -42,7 +42,7 @@
19 surface->swap_buffers(buffer);
20 }
21 virtual mir::geometry::Size size() const { return surface->size(); }
22- virtual MirPixelFormat pixel_format() const { return static_cast<MirPixelFormat>(surface->pixel_format()); }
23+ virtual MirPixelFormat pixel_format() const { return surface->pixel_format(); }
24
25 std::shared_ptr<Surface> const surface;
26 };

Subscribers

People subscribed via source and target branches