From 3535aacc23c8c654e944fa7cbe064e459a8c61da Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Tue, 27 Sep 2011 15:17:00 +0000 Subject: [PATCH] fixed bug #1389 --- modules/imgproc/include/opencv2/imgproc/imgproc.hpp | 11 +++-------- modules/objdetect/src/haar.cpp | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp index 5a18fd27d..47c8c6cc6 100644 --- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp @@ -588,6 +588,9 @@ CV_EXPORTS_W void accumulateProduct( InputArray src1, InputArray src2, //! updates the running average (dst = dst*(1-alpha) + src*alpha) CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst, double alpha, InputArray mask=noArray() ); + +CV_EXPORTS_W Point2d phaseCorrelate(InputArray src1, InputArray src2, InputArray window = noArray()); +CV_EXPORTS_W void createHanningWindow(OutputArray dst, Size winSize, int type); //! type of the threshold operation enum { THRESH_BINARY=CV_THRESH_BINARY, THRESH_BINARY_INV=CV_THRESH_BINARY_INV, @@ -1137,14 +1140,6 @@ struct CvLSHOperations virtual int hash_lookup(lsh_hash h, int l, int* ret_i, int ret_i_max) = 0; }; -namespace cv -{ - -CV_EXPORTS_W cv::Point2d phaseCorrelate(InputArray _src1, InputArray _src2, InputArray window = noArray()); -CV_EXPORTS_W void createHanningWindow(OutputArray _dst, cv::Size winSize, int type); - -} - #endif /* __cplusplus */ #endif diff --git a/modules/objdetect/src/haar.cpp b/modules/objdetect/src/haar.cpp index 6ff21c609..b82b2442c 100644 --- a/modules/objdetect/src/haar.cpp +++ b/modules/objdetect/src/haar.cpp @@ -184,7 +184,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade ) int datasize; int total_classifiers = 0; int total_nodes = 0; - char errorstr[100]; + char errorstr[1000]; CvHidHaarClassifier* haar_classifier_ptr; CvHidHaarTreeNode* haar_node_ptr; CvSize orig_window_size;