X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=04f944de6014b8d439a9badcdb55d08f4c96b4a5;hb=d6cd19121e0821cf40633533ae22c93c88f9e33b;hp=fe954957aeb7434e8f251cf1461f067405766000;hpb=08b73681b0ea6206fc6dc96575ac3e8d6006bc70;p=apps%2Fagl-service-windowmanager.git diff --git a/src/layers.cpp b/src/layers.cpp index fe95495..04f944d 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * Copyright (c) 2017 TOYOTA MOTOR CORPORATION * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,10 @@ layer::layer(nlohmann::json const &j) { this->role = j["role"]; this->name = j["name"]; this->layer_id = j["layer_id"]; - this->rect = genivi::full_rect; + this->rect = compositor::full_rect; if (j["area"]["type"] == "rect") { auto jr = j["area"]["rect"]; - this->rect = genivi::rect{ + this->rect = compositor::rect{ jr["width"], jr["height"], jr["x"], jr["y"], }; } @@ -77,7 +77,7 @@ struct result to_layer_map(nlohmann::json const &j) { j.value("layer_id", -1), layer(j)); }); - // XXX: add sanity checks here? + // TODO: add sanity checks here? // * check for double IDs // * check for double names/roles @@ -134,7 +134,7 @@ optional layer_map::get_layer_id(std::string const &role) { } json layer::to_json() const { - auto is_full = this->rect == genivi::full_rect; + auto is_full = this->rect == compositor::full_rect; json r{}; if (is_full) {