auto_zoom: code cleanup by dropping unnecessary dynamic_cast

Change-Id: Iaad4e0a19a5f4960acd87d6f328cf93b5aee3da7
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/services/auto_zoom/src/AutoZoom.cpp b/services/auto_zoom/src/AutoZoom.cpp
index 729c767b25f331f2364a43e8e28c2e16d3a81b8f..b190eb2ee309c53bc2acee8e95d442c82a1bece5 100644 (file)
--- a/services/auto_zoom/src/AutoZoom.cpp
+++ b/services/auto_zoom/src/AutoZoom.cpp
@@ -113,24 +113,26 @@ AutoZoom::AutoZoom()
 
        _taskManager = make_unique<TaskManager>();
 
-       auto face_detection_node = _taskManager->requestNewNode(NodeType::INFERENCE, "face_detection");
-       if (dynamic_cast<InferenceNode *>(face_detection_node) == nullptr)
+       auto face_detection_node =
+                       dynamic_cast<InferenceNode *>(_taskManager->requestNewNode(NodeType::INFERENCE, "face_detection"));
+       if (!face_detection_node)
                throw InvalidOperation("Invalid inference node.");
 
-       dynamic_cast<InferenceNode *>(face_detection_node)->setInferenceTask(factory->createFaceDetection());
+       face_detection_node->setInferenceTask(factory->createFaceDetection());
 
-       auto bridge_node = _taskManager->requestNewNode(NodeType::BRIDGE, "bridge_node");
-       if (dynamic_cast<BridgeNode *>(bridge_node) == nullptr)
+       auto bridge_node = dynamic_cast<BridgeNode *>(_taskManager->requestNewNode(NodeType::BRIDGE, "bridge_node"));
+       if (!bridge_node)
                throw InvalidOperation("Invalid bridge node.");
 
-       dynamic_cast<BridgeNode *>(bridge_node)->setCb(BridgeNodeCallback);
+       bridge_node->setCb(BridgeNodeCallback);
        bridge_node->addDependency(face_detection_node);
 
-       auto face_recognition_node = _taskManager->requestNewNode(NodeType::INFERENCE, "face_recognition_node");
-       if (dynamic_cast<InferenceNode *>(face_recognition_node) == nullptr)
+       auto face_recognition_node =
+                       dynamic_cast<InferenceNode *>(_taskManager->requestNewNode(NodeType::INFERENCE, "face_recognition_node"));
+       if (!face_recognition_node)
                throw InvalidOperation("Invalid inference node.");
 
-       dynamic_cast<InferenceNode *>(face_recognition_node)->setInferenceTask(factory->createFaceRecognition());
+       face_recognition_node->setInferenceTask(factory->createFaceRecognition());
        face_recognition_node->addDependency(bridge_node);
 
        auto endpoint_node = _taskManager->requestNewNode(NodeType::ENDPOINT, "endpoint");

diff --git a/services/task_manager/src/TaskManager.cpp b/services/task_manager/src/TaskManager.cpp
index b3b6388afac9ba0d3ac6c5d627ffc589aa1108ed..963a0bec7eed1e07d575e2290c87b135680a03b5 100644 (file)
--- a/services/task_manager/src/TaskManager.cpp
+++ b/services/task_manager/src/TaskManager.cpp
@@ -62,7 +62,7 @@ INode *TaskManager::requestNewNode(NodeType type, std::string nodeName)
        } catch (const std::bad_alloc &e) {
                SINGLEO_LOGE("A new node creation failed.(%s)", e.what());
                throw BadAddress("A new node creation failed.");
-       } catch(const BaseException &e) {
+       } catch (const BaseException &e) {
                SINGLEO_LOGE("Node type not supported.");
                throw e;
        }