Merge pull request #3063 from mpashchenkov/mp/klocwork-issues

Fixed some demo mistakes

Author: Wovchena

demos/common/cpp/models/src/style_transfer_model.cpp

@@ -40,7 +40,12 @@ void StyleTransferModel::prepareInputsOutputs(InferenceEngine::CNNNetwork& cnnNe
     SizeVector& inSizeVector = inputShapes.begin()->second;
     if (inSizeVector.size() != 4 || inSizeVector[0] != 1 || inSizeVector[1] != 3)
         throw std::runtime_error("3-channel 4-dimensional model's input is expected");
-    InputInfo& inputInfo = *cnnNetwork.getInputsInfo().begin()->second;
+    auto inputsDataMap = cnnNetwork.getInputsInfo();
+    if (inputsDataMap.empty()) {
+        throw std::runtime_error("Network input data node information is empty");
+    }
+    InputInfo& inputInfo = *inputsDataMap.begin()->second;
+
     inputInfo.setPrecision(Precision::FP32);
 
     // --------------------------- Prepare output blobs -----------------------------------------------------

demos/gaze_estimation_demo/cpp/src/landmarks_estimator.cpp

@@ -11,8 +11,7 @@ namespace gaze_estimation {
 
 LandmarksEstimator::LandmarksEstimator(
     InferenceEngine::Core& ie, const std::string& modelPath, const std::string& deviceName) :
-        ieWrapper(ie, modelPath, modelType, deviceName)
-{
+        ieWrapper(ie, modelPath, modelType, deviceName), numberLandmarks (0u) {
     inputBlobName = ieWrapper.expectSingleInput();
     ieWrapper.expectImageInput(inputBlobName);
 

demos/gesture_recognition_demo/cpp_gapi/main.cpp

@@ -101,15 +101,19 @@ int main(int argc, char *argv[]) {
             FLAGS_m_d,                         // path to model
             fileNameNoExt(FLAGS_m_d) + ".bin", // path to weights
             FLAGS_d_d                          // device to use
-        }.cfgOutputLayers({"boxes"}); // This clarification here because
-                                      // of GAPI take the last layer from .xml
-                                      // and last layer sould be the outpul layer
+        }.cfgOutputLayers({"boxes"}); // This clarification here because of
+                                      // GAPI take the first layer name from OutputsInfo
+                                      // for one output G_API_NET API
+        slog::info << "The Person Detection ASL model " << FLAGS_m_d << " is loaded to " << FLAGS_d_d << " device." << slog::endl;
 
         auto action_recognition = cv::gapi::ie::Params<nets::ActionRecognition> {
             FLAGS_m_a,                         // path to model
             fileNameNoExt(FLAGS_m_a) + ".bin", // path to weights
             FLAGS_d_a                          // device to use
-        }.cfgOutputLayers({"output"}); // The same
+        }.cfgOutputLayers({"output"}); // This clarification here because of
+                                       // GAPI take the first layer name from OutputsInfo
+                                       // for one output G_API_NET API
+        slog::info << "The Action Recognition model " << FLAGS_m_a << " is loaded to " << FLAGS_d_a << " device." << slog::endl;
 
         /** Custom kernels **/
         auto kernels = custom::kernels();

demos/gesture_recognition_demo/cpp_gapi/src/custom_kernels.cpp

@@ -112,6 +112,12 @@ struct Params {
         prepared_mat = params.prepared_mat;
         last_id.fetch_add(params.last_id);
     }
+    Params& operator=(const Params& params) {
+        current_frame = params.current_frame;
+        prepared_mat = params.prepared_mat;
+        last_id.fetch_add(params.last_id);
+        return *this;
+    }
 };
 } // namespace BatchState
 

demos/interactive_face_detection_demo/cpp_gapi/face.cpp

@@ -6,7 +6,8 @@
 
 Face::Face(size_t id, cv::Rect& location):
     _location(location), _intensity_mean(0.f), _id(id), _age(-1),
-    _maleScore(0), _femaleScore(0), _yaw(0.f), _pitch(0.f), _roll(0.f) {}
+    _maleScore(0), _femaleScore(0), _yaw(0.f), _pitch(0.f), _roll(0.f),
+    _realFaceConfidence(0.f) {}
 
 void Face::updateAge(float value) {
     _age = (_age == -1) ? value : 0.95f * _age + 0.05f * value;

demos/interactive_face_detection_demo/cpp_gapi/face.hpp

@@ -44,8 +44,8 @@ struct Face {
     float _yaw;
     float _pitch;
     float _roll;
-    std::vector<float> _landmarks;
     float _realFaceConfidence;
+    std::vector<float> _landmarks;
 };
 
 // ----------------- Utils -----------------