Mir

Merge lp:~kdub/mir/remove-get-buffer-usage into lp:~mir-team/mir/publish-new-apis

Proposed by Kevin DuBois
Status: Rejected
Rejected by: Cemil Azizoglu
Proposed branch: lp:~kdub/mir/remove-get-buffer-usage
Merge into: lp:~mir-team/mir/publish-new-apis
Diff against target: 35 lines (+0/-14)
2 files modified
src/client/mir_buffer_api.cpp (+0/-13)
src/client/symbols.map (+0/-1)
To merge this branch: bzr merge lp:~kdub/mir/remove-get-buffer-usage
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Abstain
Review via email: mp+316230@code.launchpad.net

Commit message

remove mir_buffer_get_buffer_usage from gated api before publishing.

Description of the change

remove mir_buffer_get_buffer_usage from gated api before publishing.

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Already in there

review: Abstain

Unmerged revisions

3956. By Kevin DuBois

remove get buffer usage api

3955. By Cemil Azizoglu

Fix clang build.

3954. By Cemil Azizoglu

Merge lp:mir... no conflicts!?

3953. By Cemil Azizoglu

Deprecate types too.

3952. By Cemil Azizoglu

Merge lp:mir, fix conflict again.

3951. By Cemil Azizoglu

merge lp:mir, fix conflict

3950. By Cemil Azizoglu

More cleanups

3949. By Cemil Azizoglu

"Staging" can now use the published headers

3948. By Cemil Azizoglu

Unversion and ignore version.h

3947. By Cemil Azizoglu

Publishing new APIs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/client/mir_buffer_api.cpp'
--- src/client/mir_buffer_api.cpp 2017-01-30 08:13:20 +0000
+++ src/client/mir_buffer_api.cpp 2017-02-02 13:58:22 +0000
@@ -168,19 +168,6 @@
168 return mir_pixel_format_invalid;168 return mir_pixel_format_invalid;
169}169}
170170
171MirBufferUsage mir_buffer_get_buffer_usage(MirBuffer* b)
172try
173{
174 mir::require(b);
175 auto buffer = reinterpret_cast<mcl::MirBuffer*>(b);
176 return buffer->buffer_usage();
177}
178catch (std::exception const& ex)
179{
180 MIR_LOG_UNCAUGHT_EXCEPTION(ex);
181 return mir_buffer_usage_hardware;
182}
183
184bool mir_buffer_is_valid(MirBuffer* b)171bool mir_buffer_is_valid(MirBuffer* b)
185try172try
186{173{
187174
=== modified file 'src/client/symbols.map'
--- src/client/symbols.map 2017-02-01 22:28:16 +0000
+++ src/client/symbols.map 2017-02-02 13:58:22 +0000
@@ -585,7 +585,6 @@
585 mir_buffer_get_width;585 mir_buffer_get_width;
586 mir_buffer_get_height;586 mir_buffer_get_height;
587 mir_buffer_get_pixel_format;587 mir_buffer_get_pixel_format;
588 mir_buffer_get_buffer_usage;
589 mir_buffer_is_valid;588 mir_buffer_is_valid;
590 mir_buffer_get_error_message;589 mir_buffer_get_error_message;
591 mir_buffer_get_buffer_package;590 mir_buffer_get_buffer_package;

Subscribers

People subscribed via source and target branches