From 9966d7feba7a3f35196f99e1a4263841cdac634d Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Tue, 28 Aug 2012 20:01:40 +0400 Subject: [PATCH] add structures for cascade representation --- .../include/opencv2/objdetect/objdetect.hpp | 12 +++ modules/objdetect/src/softcascade.cpp | 74 +++++++++++++++++++ modules/objdetect/test/test_softcascade.cpp | 47 ++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 modules/objdetect/src/softcascade.cpp create mode 100644 modules/objdetect/test/test_softcascade.cpp diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp index fbcc6ba5c8..690d63bbc5 100644 --- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp @@ -506,7 +506,19 @@ protected: // int stripSize, int yStep, double factor, vector& candidates, // vector& rejectLevels, vector& levelWeights, bool outputRejectLevels=false); enum { BOOST = 0 }; + private: + struct Feature + { + cv::Rect rect; + int channel; + }; + + stuct Stamp + { + + }; + struct Filds; Filds* filds; }; diff --git a/modules/objdetect/src/softcascade.cpp b/modules/objdetect/src/softcascade.cpp new file mode 100644 index 0000000000..1d2604c1b0 --- /dev/null +++ b/modules/objdetect/src/softcascade.cpp @@ -0,0 +1,74 @@ +/*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-2011, 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: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// * Redistributions 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*/ + +struct Filds +{ + // cv::Mat luv; + // std::vector bins; + // cv::Mat magnitude; + // double scaleFactor; + // int windowStep; +}; + + +SoftCascade::SoftCascade() : filds(0) {} + +SoftCascade::SoftCascade( const string& filename ) +{ + filds = new filds; + load(filename); +} +virtual SoftCascade::~SoftCascade() +{ + delete filds; +} + +bool SoftCascade::load( const string& filename ) +{ + return true; +} + +virtual void SoftCascade::detectMultiScale(const Mat& image, const std::vector& rois, std::vector& objects, + const double factor = 1.05, const int step = 4, const int rejectfactor = 1) +{} + +virtual void SoftCascade::detectForOctave(const int octave) +{} \ No newline at end of file diff --git a/modules/objdetect/test/test_softcascade.cpp b/modules/objdetect/test/test_softcascade.cpp new file mode 100644 index 0000000000..fc7baaad24 --- /dev/null +++ b/modules/objdetect/test/test_softcascade.cpp @@ -0,0 +1,47 @@ +/*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-2011, 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: +// +// * Redistributions of source code must retain the above copyright notice, +// this list of conditions and the following disclaimer. +// +// * Redistributions 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 "test_precomp.hpp" + +TEST(SoftCascade, HOG) +{ + +} \ No newline at end of file