Delphi/Delphi-OpenCV
1
0
Fork 0
mirror of https://github.com/Laex/Delphi-OpenCV.git synced 2024-11-15 07:45:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partial support for CascadeClassifier::detectMultiScale

Browse Source
This commit is contained in:
Michael Bunk 2017-09-14 11:35:01 +02:00
parent 3485071d47
commit 6f59aa6319
4 changed files with 80 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/classes/ocv.cls.core.pas
View File

@ -40,6 +40,9 @@ Type
TSize = class(TOCVCommon, ISize)
public
constructor Create; overload;
constructor Create(const sz: TCvSize); overload;
destructor Destroy; override;
end;
IRect2i = interface(IOCVCommon)
@ -528,4 +531,27 @@ procedure setUseOptimized; external core_lib name '?setUseOptimized@cv@@YAX_N@Z'
function useOptimized; external core_lib name '?useOptimized@cv@@YA_NXZ';
{$ENDIF}
{ TSize }
function _CreateSize: TOpenCVClass; stdcall; external opencv_classes_lib name '_CreateSize@0';
procedure _DestroySize(const s: TOpenCVClass); stdcall; external opencv_classes_lib name '_DestroySize@4';
function _CreateSizeFromCvSize(const sz: PCvSize): TOpenCVClass; stdcall; external opencv_classes_lib name '_CreateSizeFromCvSize@4';
constructor TSize.Create;
begin
inherited Create(_CreateSize);
end;
constructor TSize.Create(const sz: TCvSize);
begin
inherited Create(_CreateSizeFromCvSize(@sz));
end;
destructor TSize.Destroy;
begin
if Assigned(FData) then
_DestroySize(FData);
inherited;
end;
end.

29
source/classes/ocv.cls.objdetect.pas
View File

@ -41,7 +41,7 @@ Type
function empty(): cbool;
function load(const FileName: String): cbool;
// function Read(const node: IFileNode): cbool;
procedure detectMultiScale(Image: IMat; Var objects: TVectorRect; scaleFactor: double { = 1.1 };
procedure detectMultiScale(Image: IMat; var objects: TArray<TCvRect>; scaleFactor: double { = 1.1 };
minNeighbors: integer { = 3 }; flags: integer { = 0 }; minSize: ISize { = Size() };
maxSize: ISize { = Size() } ); overload;
procedure detectMultiScale(Image: IMat; Var objects: TVectorRect; var numDetections: TVectorInt;
@ -104,7 +104,7 @@ Type
- (Python) A face detection example using cascade classifiers can be found at
opencv_source_code/samples/python2/facedetect.py
*)
procedure detectMultiScale(Image: IMat; Var objects: TVectorRect; scaleFactor: double { = 1.1 };
procedure detectMultiScale(Image: IMat; var objects: TArray<TCvRect>; scaleFactor: double { = 1.1 };
minNeighbors: integer { = 3 }; flags: integer { = 0 }; minSize: ISize { = Size() };
maxSize: ISize { = Size() } ); overload;
@ -146,7 +146,7 @@ Type
implementation
Uses
ocv.core_c, ocv.utils, ocv.lib;
ocv.core_c, ocv.utils, ocv.lib, SysUtils;
// ------------------------------ CascadeClassifier ------------------------------
function _CreateCascadeClassifier: TOpenCVClass; stdcall; external opencv_classes_lib name '_CreateCascadeClassifier@0';
@ -166,6 +166,12 @@ function _CascadeClassifier_setImage(CascadeClassifier: TOpenCVClass; m: TOpenCV
external opencv_classes_lib name '_CascadeClassifier_setImage@8';
// function _CascadeClassifier_convert(CascadeClassifier: TOpenCVClass; oldcascade, newcascade: PAnsiChar): cbool; stdcall;
// external opencv_classes_lib name '_CascadeClassifier_convert@12';
procedure _CascadeClassifier_detectMultiScale(CascadeClassifier: TOpenCVClass;
Image: TOpenCVClass; Var rects: TOpenCVClass; var rectCount: NativeUInt; scaleFactor: double;
minNeighbors: integer; flags: integer; minSize: TOpenCVClass; maxSize: TOpenCVClass); stdcall;
external opencv_classes_lib name '_CascadeClassifier_detectMultiScale@40';
procedure _CascadeClassifier_copyAndDestroyRects(rects: TOpenCVClass; objects: Pointer); stdcall;
external opencv_classes_lib name '_CascadeClassifier_copyAndDestroyRects@8';
{ ------------------------------ TCascadeClassifier ------------------------------ }
@ -176,12 +182,12 @@ function _CascadeClassifier_setImage(CascadeClassifier: TOpenCVClass; m: TOpenCV
constructor TCascadeClassifier.Create;
begin
FData := _CreateCascadeClassifier;
inherited Create(_CreateCascadeClassifier);
end;
constructor TCascadeClassifier.Create(const FileName: String);
begin
FData := _CreateCascadeClassifier;
inherited Create(_CreateCascadeClassifier);
load(FileName);
end;
@ -195,20 +201,25 @@ end;
procedure TCascadeClassifier.detectMultiScale(Image: IMat; var objects: TVectorRect; var numDetections: TVectorInt;
scaleFactor: double; minNeighbors, flags: integer; minSize, maxSize: ISize);
begin
raise Exception.Create('Not implemented');
end;
procedure TCascadeClassifier.detectMultiScale(Image: IMat; var objects: TVectorRect; var rejectLevels: TVectorInt;
var levelWeights: TVectorDouble; scaleFactor: double; minNeighbors, flags: integer; minSize, maxSize: ISize;
outputRejectLevels: cbool);
begin
raise Exception.Create('Not implemented');
end;
procedure TCascadeClassifier.detectMultiScale(Image: IMat; var objects: TVectorRect; scaleFactor: double;
procedure TCascadeClassifier.detectMultiScale(Image: IMat; var objects: TArray<TCvRect>; scaleFactor: double;
minNeighbors, flags: integer; minSize, maxSize: ISize);
var rects: TOpenCVClass; rectCount: NativeUInt;
begin
if Not Assigned(FData) then raise Exception.Create('TCascadeClassifier.detectMultiScale: FData is null');
_CascadeClassifier_detectMultiScale(FData, Image._InternalData, rects, rectCount,
scaleFactor, minNeighbors, flags, minSize._InternalData, maxSize._InternalData);
SetLength(objects, rectCount);
_CascadeClassifier_copyAndDestroyRects(rects, objects);
end;
function TCascadeClassifier.empty: cbool;

16
source/opencv_classes/core_prx.cpp
View File

@ -59,4 +59,20 @@ namespace cv
delete e;
};
ICLASS_API Size* __stdcall CreateSize()
{
return new Size();
}
ICLASS_API void __stdcall DestroySize(Size* s)
{
delete s;
}
ICLASS_API Size* __stdcall CreateSizeFromCvSize(const CvSize *sz)
{
return new Size(*sz);
}
}

18
source/opencv_classes/objdetect_prx.cpp
View File

@ -51,4 +51,22 @@ namespace cv
//{
// return e->convert(oldcascade, newcascade);
// }
ICLASS_API void __stdcall CascadeClassifier_detectMultiScale(CascadeClassifier* e, Mat* m,
vector<Rect>** rects, size_t* rectCount,
double scaleFactor = 1.1, int minNeighbors = 3, int flags = 0, Size* minSize = NULL, Size* maxSize = NULL)
{
*rects = new vector<Rect>;
e->detectMultiScale(*m, **rects, scaleFactor, minNeighbors, flags, *minSize, *maxSize);
*rectCount = (*rects)->size();
}
ICLASS_API void __stdcall CascadeClassifier_copyAndDestroyRects(vector<Rect>* rects, CvRect* objects)
{
for (int i = 0; i < rects->size(); i++)
{
objects[i] = (*rects)[i];
}
delete rects;
}
}