Merge pull request #2951 from vladimir-dudnik/vd/fix-clamp-in-yolo

fix object_detection_demo/cpp for yolo models

Author: Wovchena

demos/common/cpp/models/src/detection_model_yolo.cpp

@@ -292,8 +292,8 @@ void ModelYolo::parseYOLOOutput(const std::string& output_name,
                 DetectedObject obj;
                 obj.x = clamp(x-width/2, 0.f, (float)original_im_w);
                 obj.y = clamp(y-height/2, 0.f, (float)original_im_h);
-                obj.width = clamp(width, 0.f, (float)original_im_w) - obj.x;
-                obj.height = clamp(height, 0.f, (float)original_im_h) - obj.y;
+                obj.width = clamp(width, 0.f, (float)original_im_w - obj.x);
+                obj.height = clamp(height, 0.f, (float)original_im_h - obj.y);
 
                 for (int j = 0; j < region.classes; ++j) {
                     int class_index = calculateEntryIndex(entriesNum, region.coords, region.classes + isObjConf, n * entriesNum + i, region.coords + isObjConf + j);

demos/object_detection_demo/cpp/main.cpp

@@ -265,10 +265,8 @@ cv::Mat renderDetectionData(DetectionResult& result, const ColorPalette& palette
         std::ostringstream conf;
         conf << ":" << std::fixed << std::setprecision(1) << obj.confidence * 100 << '%';
         const auto& color = palette[obj.labelID];
-        cv::putText(outputImg, obj.label + conf.str(),
-            cv::Point2f(obj.x, obj.y - 5), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, { 230, 230, 230 }, 3);
-        cv::putText(outputImg, obj.label + conf.str(),
-            cv::Point2f(obj.x, obj.y - 5), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color);
+        putHighlightedText(outputImg, obj.label + conf.str(),
+            cv::Point2f(obj.x, obj.y - 5), cv::FONT_HERSHEY_COMPLEX_SMALL, 1, color, 2);
         cv::rectangle(outputImg, obj, color, 2);
     }