Merge branch 'openvinotoolkit:master' into master

Author: ieliz

demos/interactive_face_detection_demo/cpp_gapi/face.hpp

@@ -5,10 +5,11 @@
 # pragma once
 
 #include <list>
+#include <map>
 
 #include <opencv2/opencv.hpp>
 
-// -------------------------Describe detected face on a frame-------------------------------------------------
+// -------------------------Describe detected face on a frame-------------------
 
 struct Face {
 public:

demos/interactive_face_detection_demo/cpp_gapi/visualizer.cpp

@@ -1,16 +1,19 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #include <utils/ocv_common.hpp>
 #include "visualizer.hpp"
 
 // EmotionBarVisualizer
-EmotionBarVisualizer::EmotionBarVisualizer(std::vector<std::string> const& emotionNames, cv::Size size, cv::Size padding,
-                                     double opacity, double textScale, int textThickness):
-                                     emotionNames(emotionNames), size(size), padding(padding),
-                                     opacity(opacity), textScale(textScale), textThickness(textThickness),
-                                     internalPadding(0) {
+EmotionBarVisualizer::EmotionBarVisualizer(std::vector<std::string> const& emotionNames,
+                                           cv::Size size,
+                                           cv::Size padding,
+                                           double opacity,
+                                           double textScale,
+                                           int textThickness):
+    emotionNames(emotionNames), size(size), padding(padding), opacity(opacity),
+    textScale(textScale), textThickness(textThickness), internalPadding(0) {
     auto itMax = std::max_element(emotionNames.begin(), emotionNames.end(), [] (std::string const& lhs, std::string const& rhs) {
         return lhs.length() < rhs.length();
     });
@@ -68,7 +71,7 @@ void PhotoFrameVisualizer::draw(cv::Mat& img, cv::Rect& bb, cv::Scalar color) {
 
 // HeadPoseVisualizer
 HeadPoseVisualizer::HeadPoseVisualizer(float scale, cv::Scalar xAxisColor, cv::Scalar yAxisColor, cv::Scalar zAxisColor, int axisThickness):
-                        xAxisColor(xAxisColor), yAxisColor(yAxisColor), zAxisColor(zAxisColor), axisThickness(axisThickness), scale(scale) {
+    xAxisColor(xAxisColor), yAxisColor(yAxisColor), zAxisColor(zAxisColor), axisThickness(axisThickness), scale(scale) {
 }
 
 void HeadPoseVisualizer::buildCameraMatrix(cv::Mat& cameraMatrix, int cx, int cy, float focalLength) {
@@ -151,13 +154,13 @@ void HeadPoseVisualizer::draw(cv::Mat& frame, cv::Point3f cpoint, float yaw, flo
 // Visualizer
 Visualizer::Visualizer(bool m_ag, bool m_em, bool m_hp, bool m_lm,
                        int leftPadding, int rightPadding, int topPadding, int bottomPadding):
-                       emotionVisualizer(nullptr), photoFrameVisualizer(std::make_shared<PhotoFrameVisualizer>()),
-                       headPoseVisualizer(std::make_shared<HeadPoseVisualizer>()),
-                       nxcells(0), nycells(0), xstep(0), ystep(0), leftPadding(leftPadding),
-                       rightPadding(rightPadding), topPadding(topPadding),
-                       bottomPadding(bottomPadding), frameCounter(0),
-                       _isAgeGenderEnabled(m_ag), _isEmotionsEnabled(m_em),
-                       _isHeadPoseEnabled(m_hp), _isLandmarksEnabled(m_lm) {}
+    emotionVisualizer(nullptr), photoFrameVisualizer(std::make_shared<PhotoFrameVisualizer>()),
+    headPoseVisualizer(std::make_shared<HeadPoseVisualizer>()),
+    nxcells(0), nycells(0), xstep(0), ystep(0), leftPadding(leftPadding),
+    rightPadding(rightPadding), topPadding(topPadding),
+    bottomPadding(bottomPadding), frameCounter(0),
+    _isAgeGenderEnabled(m_ag), _isEmotionsEnabled(m_em),
+    _isHeadPoseEnabled(m_hp), _isLandmarksEnabled(m_lm) {}
 
 void Visualizer::enableEmotionBar(const cv::Size inImgSize, std::vector<std::string> const& emotionNames) {
     if (inImgSize != imgSize) {
@@ -186,10 +189,11 @@ void Visualizer::enableEmotionBar(const cv::Size inImgSize, std::vector<std::str
 }
 
 void Visualizer::drawFace(cv::Mat& img, Face::Ptr f, bool drawEmotionBar) {
-    auto genderColor = (_isAgeGenderEnabled) ?
-                       ((f->isMale()) ? cv::Scalar(255, 0, 0) :
-                                        cv::Scalar(147, 20, 255)) :
-                                        cv::Scalar(100, 100, 100);
+    auto genderColor = (_isAgeGenderEnabled)
+                       ? ((f->isMale())
+                           ? cv::Scalar(255, 0, 0)
+                           : cv::Scalar(147, 20, 255))
+                       : cv::Scalar(100, 100, 100);
 
     std::ostringstream out;
     if (_isAgeGenderEnabled) {

demos/interactive_face_detection_demo/cpp_gapi/visualizer.hpp

@@ -1,22 +1,31 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 //
 
 #pragma once
 
 #include "face.hpp"
 
-// -------------------------Generic routines for visualization of detection results-------------------------------------------------
+// --------Generic routines for visualization of detection results--------
 
 // Drawing a bar of emotions
 class EmotionBarVisualizer {
 public:
     using Ptr = std::shared_ptr<EmotionBarVisualizer>;
 
-    explicit EmotionBarVisualizer(std::vector<std::string> const& emotionNames, cv::Size size = cv::Size(300, 140), cv::Size padding = cv::Size(10, 10),
-                              double opacity = 0.6, double textScale = 1, int textThickness = 1);
+    explicit EmotionBarVisualizer(std::vector<std::string> const& emotionNames,
+                                  cv::Size size = cv::Size(300, 140),
+                                  cv::Size padding = cv::Size(10, 10),
+                                  double opacity = 0.6,
+                                  double textScale = 1,
+                                  int textThickness = 1);
+
+    void draw(cv::Mat& img,
+              std::map<std::string, float> emotions,
+              cv::Point org,
+              cv::Scalar fgcolor,
+              cv::Scalar bgcolor);
 
-    void draw(cv::Mat& img, std::map<std::string, float> emotions, cv::Point org, cv::Scalar fgcolor, cv::Scalar bgcolor);
     cv::Size getSize();
 private:
     std::vector<std::string> emotionNames;
@@ -52,10 +61,10 @@ class HeadPoseVisualizer {
     using Ptr = std::shared_ptr<HeadPoseVisualizer>;
 
     explicit HeadPoseVisualizer(float scale = 50,
-                            cv::Scalar xAxisColor = cv::Scalar(0, 0, 255),
-                            cv::Scalar yAxisColor = cv::Scalar(0, 255, 0),
-                            cv::Scalar zAxisColor = cv::Scalar(255, 0, 0),
-                            int axisThickness = 2);
+                                cv::Scalar xAxisColor = cv::Scalar(0, 0, 255),
+                                cv::Scalar yAxisColor = cv::Scalar(0, 255, 0),
+                                cv::Scalar zAxisColor = cv::Scalar(255, 0, 0),
+                                int axisThickness = 2);
 
     void draw(cv::Mat& frame, cv::Point3f cpoint, float yaw, float pitch, float roll);
 

licensing/third-party-programs.txt renamed to licensing/omz-third-party-programs.txt

@@ -146,7 +146,9 @@ def _read_configs(arguments):
         definitions = os.environ.get(DEFINITION_ENV_VAR) or local_config.get('global_definitions')
         if definitions:
             definitions = read_yaml(Path(arguments.config).parent / definitions)
-        global_config = read_yaml(arguments.definitions) if arguments.definitions else definitions
+        global_config = (
+            read_yaml(arguments.definitions) if 'definitions' in arguments and arguments.definitions else definitions
+        )
 
         return global_config, local_config