diff options
Diffstat (limited to 'src/layers.cpp')
| -rw-r--r-- | src/layers.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/layers.cpp b/src/layers.cpp index 013c16a..7cc2f00 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -26,10 +26,8 @@ surface_id_to_layer::surface_id_to_layer(nlohmann::json const &j) { if (j["area"]["type"] == "rect") { auto jr = j["area"]["rect"]; this->rect = genivi::rect{ - get<int32_t>(jr["width"]), - get<int32_t>(jr["height"]), - get<int32_t>(jr["x"]), - get<int32_t>(jr["y"]), + get<int32_t>(jr["width"]), get<int32_t>(jr["height"]), + get<int32_t>(jr["x"]), get<int32_t>(jr["y"]), }; } } @@ -98,9 +96,10 @@ inline bool } namespace { -optional<surface_id_to_layer> get_surface_id_to_layer(struct surface_id_to_layer_map const *s2l, int surface_id) { - auto i = std::lower_bound(std::cbegin(s2l->mapping), - std::cend(s2l->mapping), surface_id); +optional<surface_id_to_layer> get_surface_id_to_layer( + struct surface_id_to_layer_map const *s2l, int surface_id) { + auto i = std::lower_bound(std::cbegin(s2l->mapping), std::cend(s2l->mapping), + surface_id); if (i != s2l->mapping.end()) { // std::less only checks for surface_id_to_layer::id_max, so check @@ -119,7 +118,8 @@ optional<int> surface_id_to_layer_map::get_layer_for_surface(int surface_id) { return e ? optional<int>(e->layer_id) : nullopt; } -optional<genivi::rect> surface_id_to_layer_map::get_rect_for_surface(int surface_id) { +optional<genivi::rect> surface_id_to_layer_map::get_rect_for_surface( + int surface_id) { auto e = get_surface_id_to_layer(this, surface_id); return e ? optional<genivi::rect>(e->rect) : nullopt; } |