generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bug #1389

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-09-27 15:17:00 +00:00
parent e0bf60fd3e
commit 3535aacc23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
View File

@ -588,6 +588,9 @@ CV_EXPORTS_W void accumulateProduct( InputArray src1, InputArray src2,
//! updates the running average (dst = dst*(1-alpha) + src*alpha) //! updates the running average (dst = dst*(1-alpha) + src*alpha)
CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst, CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst,
double alpha, InputArray mask=noArray() ); 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 //! type of the threshold operation
enum { THRESH_BINARY=CV_THRESH_BINARY, THRESH_BINARY_INV=CV_THRESH_BINARY_INV, 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; 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 /* __cplusplus */
#endif #endif

2
modules/objdetect/src/haar.cpp
View File

@ -184,7 +184,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
int datasize; int datasize;
int total_classifiers = 0; int total_classifiers = 0;
int total_nodes = 0; int total_nodes = 0;
char errorstr[100]; char errorstr[1000];
CvHidHaarClassifier* haar_classifier_ptr; CvHidHaarClassifier* haar_classifier_ptr;
CvHidHaarTreeNode* haar_node_ptr; CvHidHaarTreeNode* haar_node_ptr;
CvSize orig_window_size; CvSize orig_window_size;