export AdaptiveSkinDetector and related classes; make adaptiveskindetector.cpp demo...

git-svn-id: https://code.ros.org/svn/opencv/trunk@1954 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cvaux.hpp b/opencv/include/opencv/cvaux.hpp
index 73cd747bd04199a57194ae5dd3538f88b220ded4..c10cc309e11273bc51dbd662ca118d8adec40b42 100644 (file)
--- a/opencv/include/opencv/cvaux.hpp
+++ b/opencv/include/opencv/cvaux.hpp
@@ -141,7 +141,7 @@ protected:
 *                                   Adaptive Skin Detector                               *
 \****************************************************************************************/
 
-class CvAdaptiveSkinDetector
+class CV_EXPORTS CvAdaptiveSkinDetector
 {
 private:
        enum {
@@ -151,7 +151,7 @@ private:
                GSD_INTENSITY_UT = 250
        };
 
-       class Histogram
+       class CV_EXPORTS Histogram
        {
        private:
                enum {
@@ -200,14 +200,14 @@ public:
 *                                  Fuzzy MeanShift Tracker                               *
 \****************************************************************************************/
 
-class CvFuzzyPoint {
+class CV_EXPORTS CvFuzzyPoint {
 public:
        double x, y, value;
 
        CvFuzzyPoint(double _x, double _y);
 };
 
-class CvFuzzyCurve {
+class CV_EXPORTS CvFuzzyCurve {
 private:
     std::vector<CvFuzzyPoint> points;
        double value, centre;
@@ -227,7 +227,7 @@ public:
        void setValue(double _value);
 };
 
-class CvFuzzyFunction {
+class CV_EXPORTS CvFuzzyFunction {
 public:
     std::vector<CvFuzzyCurve> curves;
 
@@ -239,7 +239,7 @@ public:
        CvFuzzyCurve *newCurve();
 };
 
-class CvFuzzyRule {
+class CV_EXPORTS CvFuzzyRule {
 private:
        CvFuzzyCurve *fuzzyInput1, *fuzzyInput2;
        CvFuzzyCurve *fuzzyOutput;
@@ -251,7 +251,7 @@ public:
        CvFuzzyCurve *getOutputCurve();
 };
 
-class CvFuzzyController {
+class CV_EXPORTS CvFuzzyController {
 private:
     std::vector<CvFuzzyRule*> rules;
 public:
@@ -261,7 +261,7 @@ public:
        double calcOutput(double param1, double param2);
 };
 
-class CvFuzzyMeanShiftTracker
+class CV_EXPORTS CvFuzzyMeanShiftTracker
 {
 private:
        class FuzzyResizer

diff --git a/opencv/include/opencv/cvvidsurv.hpp b/opencv/include/opencv/cvvidsurv.hpp
index 5233fd0812d0fe192df7d63aa86cde855f540e2e..b1a11d92b97c896c71955a1440825dd9d09d476d 100644 (file)
--- a/opencv/include/opencv/cvvidsurv.hpp
+++ b/opencv/include/opencv/cvvidsurv.hpp
@@ -117,7 +117,7 @@ private: /* Internal functions: */
         if(p->Str)free(p->Str);
         if(p->pName)free(p->pName);
         if(p->pComment)free(p->pComment);
-        cvFree((void**)pp);
+        cvFree(pp);
     }
     CvDefParam* NewParam(const char* name)
     {

diff --git a/opencv/samples/c/adaptiveskindetector.cpp b/opencv/samples/c/adaptiveskindetector.cpp
index 85ac55644fa5a03cc2fed55f825559b3014b4e3e..b036c286a519cabd1ed7a69bf25508711d7e01c6 100644 (file)
--- a/opencv/samples/c/adaptiveskindetector.cpp
+++ b/opencv/samples/c/adaptiveskindetector.cpp
@@ -36,6 +36,8 @@
 \r
 \r
 #include <iostream>\r
+#include <cstdio>\r
+#include <cstring>\r
 #include <ctime>\r
 #include <cvaux.h>\r
 #include <highgui.h>\r