Merge branch 'master' of github.com:Laex/Delphi-OpenCV

# Conflicts:
#	source/ocv.core_c.pas
This commit is contained in:
Laentir Valetov 2017-09-07 14:52:07 +04:00
commit 47e7466e6b

View File

@ -1113,7 +1113,11 @@ function cvSum(const arr: pCvArr): TCvScalar; cdecl;
} }
function cvCountNonZero(arr: pIplImage): Integer; cdecl; function cvCountNonZero(arr: pIplImage): Integer; cdecl;
(** Calculates mean and standard deviation of pixel values *) //// * Calculates mean value of array elements */
//// CVAPI(CvScalar) cvAvg( const CvArr* arr, const CvArr* mask CV_DEFAULT(NULL) );
//function cvAvg(const arr: pCvArr; const mask: pCvArr = nil): TCvScalar; cdecl;
// * Calculates mean and standard deviation of pixel values */
procedure cvAvgSdv(const arr: pCvArr; mean: pCvScalar; std_dev: pCvScalar; const mask: pCvArr = nil); cdecl; procedure cvAvgSdv(const arr: pCvArr; mean: pCvScalar; std_dev: pCvScalar; const mask: pCvArr = nil); cdecl;
{ Finds global minimum, maximum and their positions { Finds global minimum, maximum and their positions