merge Detection structure for CPU and GPU soft cascade detectors

modules/softcascade/src/detector.cpp

@@ -0,0 +1,51 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2008-2013, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and / or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#include "precomp.hpp"
+
+cv::softcascade::Detection::Detection(const cv::Rect& b, const float c, int k)
+: x(b.x), y(b.y), w(b.width), h(b.height), confidence(c), kind(k) {}
+
+cv::Rect cv::softcascade::Detection::bb() const
+{
+    return cv::Rect(x, y, w, h);
+}

modules/softcascade/src/softcascade.cpp

@@ -473,7 +473,7 @@ void DollarNMS(dvector& objects)
         {
             const Detection &b = *next;
 
-            const float ovl =  overlap(a.bb, b.bb) / std::min(a.bb.area(), b.bb.area());
+            const float ovl =  overlap(a.bb(), b.bb()) / std::min(a.bb().area(), b.bb().area());
 
             if (ovl > DollarThreshold)
                 next = objects.erase(next);
@@ -588,7 +588,7 @@ void Detector::detect(InputArray _image, InputArray _rois,  OutputArray _rects,
     int i = 0;
     for (IDet it = objects.begin(); it != objects.end(); ++it, ++i)
     {
-        rectPtr[i] = (*it).bb;
+        rectPtr[i] = (*it).bb();
         confPtr[i] = (*it).confidence;
     }
 }