~hikiko/mir/mir.unity8-desktop-session

« back to all changes in this revision

Viewing changes to tests/mir_test/display_config_matchers.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Daniel van Vugt, Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mfrom: (1.1.54)
  • Revision ID: package-import@ubuntu.com-20140108020438-ikbu7qqm9v2l026y
Tags: 0.1.3+14.04.20140108-0ubuntu1
[ Daniel van Vugt ]
* Preparing for release 0.1.3

[ Ubuntu daily release ]
* Automatic snapshot from revision 1170

Show diffs side-by-side

added added

removed removed

Lines of Context:
86
86
            display_output.modes = modes;
87
87
 
88
88
            /* Pixel formats */
89
 
            std::vector<geom::PixelFormat> pixel_formats;
 
89
            std::vector<MirPixelFormat> pixel_formats;
90
90
            for (int n = 0; n < protobuf_output.pixel_format_size(); n++)
91
91
            {
92
92
                pixel_formats.push_back(
93
 
                    static_cast<geom::PixelFormat>(protobuf_output.pixel_format(n)));
 
93
                    static_cast<MirPixelFormat>(protobuf_output.pixel_format(n)));
94
94
            }
95
95
            display_output.pixel_formats = pixel_formats;
96
96
 
151
151
            display_output.modes = modes;
152
152
 
153
153
            /* Pixel formats */
154
 
            std::vector<geom::PixelFormat> pixel_formats;
 
154
            std::vector<MirPixelFormat> pixel_formats;
155
155
            for (size_t n = 0; n < client_output.num_output_formats; n++)
156
156
            {
157
 
                pixel_formats.push_back(
158
 
                    static_cast<geom::PixelFormat>(client_output.output_formats[n]));
 
157
                pixel_formats.push_back(client_output.output_formats[n]);
159
158
            }
160
159
            display_output.pixel_formats = pixel_formats;
161
160