Add samples

Multidemo
[+] fback_c (cvCalcOpticalFlowFarneback)
[+] minarea (cvMinEnclosingCircle, cvMinAreaRect2)

Signed-off-by: Laex <laex@bk.ru>

include/highgui/highgui_c.pas

@@ -131,7 +131,8 @@ function cvGetWindowProperty(name: pCVChar; prop_id: Integer): Double; cdecl;
   //display image within window (highgui windows remember their content)
   CVAPI(void) cvShowImage( const char* name, const CvArr* image );
 }
-procedure cvShowImage(const name: pCVChar; const image: pIplImage); cdecl;
+procedure cvShowImage(const name: pCVChar; const image: pIplImage); cdecl; overload;
+procedure cvShowImage(const name: pCVChar; const image: pCvMat); cdecl;overload;
 
 (* resize/move window *)
 procedure cvResizeWindow(name: pCVChar; width: Integer; height: Integer); cdecl;
@@ -792,7 +793,9 @@ uses
   uLibName;
 
 function cvNamedWindow; external highgui_Dll;
-procedure cvShowImage; external highgui_Dll;
+//procedure cvShowImage; external highgui_Dll;
+procedure cvShowImage(const name: pCVChar; const image: pIplImage); external highgui_Dll name 'cvShowImage';
+procedure cvShowImage(const name: pCVChar; const image: pCvMat); external highgui_Dll name 'cvShowImage';
 function cvWaitKey; external highgui_Dll;
 procedure cvDestroyWindow; external highgui_Dll;
 procedure cvDestroyAllWindows; external highgui_Dll;

include/imgproc/imgproc_c.pas

@@ -191,8 +191,10 @@ procedure cvLaplace(const src: pIplImage; dst: pIplImage; aperture_size: Integer
 
 (* Converts input array pixels from one color space to another *)
 // CVAPI(void)  cvCvtColor( const CvArr* src, CvArr* dst, int code );
-procedure cvCvtColor(const src: pIplImage; dst: pIplImage; code: Integer); cdecl;
-//
+procedure cvCvtColor(const src: pIplImage; dst: pIplImage; code: Integer); cdecl; overload;
+procedure cvCvtColor(const src: pCvMat; dst: pCvMat; code: Integer); cdecl;overload;
+procedure cvCvtColor(const src: pIplImage; dst: pCvMat; code: Integer); cdecl;overload;
+
 // (* Resizes image (input array is resized to fit the destination array) *)
 // CVAPI(procedure)cvResize(var Warps image with affine transform * )
 {
@@ -558,13 +560,13 @@ function cvContourArea(const contour: PCvSeq; slice: TCvSlice { = CV_WHOLE_SEQ }
   : double; cdecl;
 
 // (* Finds minimum area rotated rectangle bounding a set of points *)
-// CVAPI(CvBox2D)  cvMinAreaRect2(  CvArr* points,
-// CvMemStorage* storage CV_DEFAULT(0));
-//
+// CVAPI(CvBox2D)  cvMinAreaRect2( const CvArr* points, CvMemStorage* storage CV_DEFAULT(NULL));
+function cvMinAreaRect2(points: PCvSeq; storage: PCvMemStorage = nil): TCvBox2D; cdecl;
+
 // (* Finds minimum enclosing circle for a set of points *)
-// CVAPI(Integer)  cvMinEnclosingCircle(  CvArr* points,
-// CvPoint2D32f* center, Single* radius );
-//
+// CVAPI(int)  cvMinEnclosingCircle( const CvArr* points,CvPoint2D32f* center, float* radius );
+function cvMinEnclosingCircle(points: PCvSeq; center: pCvPoint2D32f; radius: pSingle): Integer; cdecl;
+
 {
   /* Compares two contours by matching their moments */
   CVAPI(double)  cvMatchShapes( const void* object1, const void* object2,
@@ -600,10 +602,14 @@ function cvConvexityDefects(contour: PCvSeq; convexhull: PCvSeq; storage: PCvMem
 //
 // (* Finds minimum rectangle containing two given rectangles *)
 // CVAPI(CvRect)  cvMaxRect(  CvRect* rect1,  CvRect* rect2 );
-//
-// (* Finds coordinates of the box vertices *)
-// cvBoxPoints(box CvBox2D; pt : array[0..3] of CVAPI(procedure): CvPoint2D32f);
-//
+
+Type
+  TBoxPoints = array [0 .. 3] of TCvPoint2D32f;
+  // (* Finds coordinates of the box vertices *)
+  // CVAPI(void) cvBoxPoints( CvBox2D box, CvPoint2D32f pt[4] );
+procedure cvBoxPoints(box: TCvBox2D; pt: TBoxPoints); cdecl;
+
+
 // (* Initializes sequence header for a matrix (column or row vector) of points -
 // a wrapper for cvMakeSeqHeaderForArray (it does not initialize bounding rectangle not  not  not ) *)
 // CVAPI(CvSeq) cvPointSeqFromMat( Integer seq_kind,  CvArr* mat,
@@ -940,7 +946,11 @@ implementation
 
 Uses uLibName;
 
-procedure cvCvtColor; external imgproc_Dll;
+//procedure cvCvtColor(const src: pIplImage; dst: pIplImage; code: Integer); external imgproc_Dll;
+procedure cvCvtColor(const src: pIplImage; dst: pIplImage; code: Integer); external imgproc_Dll name 'cvCvtColor';
+procedure cvCvtColor(const src: pCvMat; dst: pCvMat; code: Integer); external imgproc_Dll name 'cvCvtColor';
+procedure cvCvtColor(const src: pIplImage; dst: pCvMat; code: Integer); external imgproc_Dll name 'cvCvtColor';
+
 function cvThreshold; external imgproc_Dll;
 procedure cvSmooth; external imgproc_Dll;
 procedure cvResize; external imgproc_Dll;
@@ -995,5 +1005,8 @@ procedure cvCalcArrHist; external imgproc_Dll;
 procedure cvCalcArrBackProject; external imgproc_Dll;
 procedure cvCalcBackProject; external imgproc_Dll name 'cvCalcArrBackProject';
 procedure cvGoodFeaturesToTrack; external imgproc_Dll;
+function cvMinAreaRect2; external imgproc_Dll;
+function cvMinEnclosingCircle; external imgproc_Dll;
+procedure cvBoxPoints; external imgproc_Dll;
 
 end.

include/video/tracking.pas

@@ -11,35 +11,34 @@ uses
 //
 /// ************************************ optical flow ***************************************/
 const
-CV_LKFLOW_PYR_A_READY       =1;
-CV_LKFLOW_PYR_B_READY       =2;
-CV_LKFLOW_INITIAL_GUESSES   =4;
-CV_LKFLOW_GET_MIN_EIGENVALS =8;
+  CV_LKFLOW_PYR_A_READY = 1;
+  CV_LKFLOW_PYR_B_READY = 2;
+  CV_LKFLOW_INITIAL_GUESSES = 4;
+  CV_LKFLOW_GET_MIN_EIGENVALS = 8;
 
-/// * It is Lucas & Kanade method, modified to use pyramids.
-// Also it does several iterations to get optical flow for
-// every point at every pyramid level.
-// Calculates optical flow between two images for certain set of points (i.e.
-// it is a "sparse" optical flow, which is opposite to the previous 3 methods) */
+  /// * It is Lucas & Kanade method, modified to use pyramids.
+  // Also it does several iterations to get optical flow for
+  // every point at every pyramid level.
+  // Calculates optical flow between two images for certain set of points (i.e.
+  // it is a "sparse" optical flow, which is opposite to the previous 3 methods) */
 
-// CVAPI(void)  cvCalcOpticalFlowPyrLK(
-//const CvArr*  prev,
-//const CvArr*  curr,
-// CvArr*  prev_pyr, CvArr*  curr_pyr,
-// const CvPoint2D32f* prev_features,
-// CvPoint2D32f* curr_features,
-// int       count,
-// CvSize    win_size,
-// int       level,
-// char*     status,
-// float*    track_error,
-// CvTermCriteria criteria,
-// int       flags );
+  // CVAPI(void)  cvCalcOpticalFlowPyrLK(
+  // const CvArr*  prev,
+  // const CvArr*  curr,
+  // CvArr*  prev_pyr, CvArr*  curr_pyr,
+  // const CvPoint2D32f* prev_features,
+  // CvPoint2D32f* curr_features,
+  // int       count,
+  // CvSize    win_size,
+  // int       level,
+  // char*     status,
+  // float*    track_error,
+  // CvTermCriteria criteria,
+  // int       flags );
 
-procedure cvCalcOpticalFlowPyrLK(const prev: pIplImage; const curr: pIplImage; prev_pyr: pIplImage;
-  curr_pyr: pIplImage; const prev_features: pCvPoint2D32f; curr_features: pCvPoint2D32f; count: Integer;
-  win_size: TCvSize; level: Integer; status: pCVChar; track_error: PSingle; criteria: TCvTermCriteria;
-  flags: Integer); cdecl;
+procedure cvCalcOpticalFlowPyrLK(const prev: pIplImage; const curr: pIplImage; prev_pyr: pIplImage; curr_pyr: pIplImage;
+  const prev_features: pCvPoint2D32f; curr_features: pCvPoint2D32f; count: Integer; win_size: TCvSize; level: Integer;
+  status: pCVChar; track_error: PSingle; criteria: TCvTermCriteria; flags: Integer); cdecl;
 
 /// * Modification of a previous sparse optical flow algorithm to calculate
 // affine flow */
@@ -61,7 +60,9 @@ procedure cvCalcOpticalFlowPyrLK(const prev: pIplImage; const curr: pIplImage; p
 // CvArr* flow, double pyr_scale, int levels,
 // int winsize, int iterations, int poly_n,
 // double poly_sigma, int flags );
-//
+procedure cvCalcOpticalFlowFarneback(const prev: pCvMat; const next: pCvMat; flow: pCvMat; pyr_scale: double;
+  levels: Integer; winsize: Integer; iterations: Integer; poly_n: Integer; poly_sigma: double; flags: Integer); cdecl;
+
 /// ********************************* motion templates *************************************/
 //
 /// ****************************************************************************************\
@@ -368,5 +369,6 @@ Uses
 
 function cvCamShift; external tracking_DLL;
 procedure cvCalcOpticalFlowPyrLK; external tracking_DLL;
+procedure cvCalcOpticalFlowFarneback; external tracking_DLL;
 
 end.

include/сore/Core.types_c.pas

@@ -51,6 +51,7 @@
 {$WARN UNSAFE_TYPE OFF}
 {$WARN UNSAFE_CODE OFF}
 {$WARN UNSAFE_CAST OFF}
+{$POINTERMATH ON}
 unit Core.types_c;
 
 interface
@@ -367,107 +368,110 @@ const
 {$EXTERNALSYM CV_USRTYPE1}
   CV_MAT_DEPTH_MASK = (CV_DEPTH_MAX - 1);
 {$EXTERNALSYM CV_MAT_DEPTH_MASK}
-  (*
-    const
-    CV_8UC1 = CV_MAKETYPE(CV_8U, 1);
-    {$EXTERNALSYM CV_8UC1}
-    CV_8UC2 = CV_MAKETYPE(CV_8U, 2);
-    {$EXTERNALSYM CV_8UC2}
-    CV_8UC3 = CV_MAKETYPE(CV_8U, 3);
-    {$EXTERNALSYM CV_8UC3}
-    CV_8UC4 = CV_MAKETYPE(CV_8U, 4);
-    {$EXTERNALSYM CV_8UC4}
-    CV_8SC1 = CV_MAKETYPE(CV_8S, 1);
-    {$EXTERNALSYM CV_8SC1}
-    CV_8SC2 = CV_MAKETYPE(CV_8S, 2);
-    {$EXTERNALSYM CV_8SC2}
-    CV_8SC3 = CV_MAKETYPE(CV_8S, 3);
-    {$EXTERNALSYM CV_8SC3}
-    CV_8SC4 = CV_MAKETYPE(CV_8S, 4);
-    {$EXTERNALSYM CV_8SC4}
-    CV_16UC1 = CV_MAKETYPE(CV_16U, 1);
-    {$EXTERNALSYM CV_16UC1}
-    CV_16UC2 = CV_MAKETYPE(CV_16U, 2);
-    {$EXTERNALSYM CV_16UC2}
-    CV_16UC3 = CV_MAKETYPE(CV_16U, 3);
-    {$EXTERNALSYM CV_16UC3}
-    CV_16UC4 = CV_MAKETYPE(CV_16U, 4);
-    {$EXTERNALSYM CV_16UC4}
-    CV_16SC1 = CV_MAKETYPE(CV_16S, 1);
-    {$EXTERNALSYM CV_16SC1}
+function CV_8UC1: Integer; inline;
 
-    const
-    CV_16SC2 = CV_MAKETYPE(CV_16S, 2);
-    {$EXTERNALSYM CV_16SC2}
+{$EXTERNALSYM CV_8UC1}
+(*
+  CV_8UC2 = CV_MAKETYPE(CV_8U, 2);
+  {$EXTERNALSYM CV_8UC2}
+*)
+function CV_8UC3: Integer; inline;
+{$EXTERNALSYM CV_8UC3}
+(*
+  CV_8UC4 = CV_MAKETYPE(CV_8U, 4);
+  {$EXTERNALSYM CV_8UC4}
+  CV_8SC1 = CV_MAKETYPE(CV_8S, 1);
+  {$EXTERNALSYM CV_8SC1}
+  CV_8SC2 = CV_MAKETYPE(CV_8S, 2);
+  {$EXTERNALSYM CV_8SC2}
+  CV_8SC3 = CV_MAKETYPE(CV_8S, 3);
+  {$EXTERNALSYM CV_8SC3}
+  CV_8SC4 = CV_MAKETYPE(CV_8S, 4);
+  {$EXTERNALSYM CV_8SC4}
+  CV_16UC1 = CV_MAKETYPE(CV_16U, 1);
+  {$EXTERNALSYM CV_16UC1}
+  CV_16UC2 = CV_MAKETYPE(CV_16U, 2);
+  {$EXTERNALSYM CV_16UC2}
+  CV_16UC3 = CV_MAKETYPE(CV_16U, 3);
+  {$EXTERNALSYM CV_16UC3}
+  CV_16UC4 = CV_MAKETYPE(CV_16U, 4);
+  {$EXTERNALSYM CV_16UC4}
+  CV_16SC1 = CV_MAKETYPE(CV_16S, 1);
+  {$EXTERNALSYM CV_16SC1}
 
-    const
-    CV_16SC3 = CV_MAKETYPE(CV_16S, 3);
-    {$EXTERNALSYM CV_16SC3}
+  const
+  CV_16SC2 = CV_MAKETYPE(CV_16S, 2);
+  {$EXTERNALSYM CV_16SC2}
 
-    const
-    CV_16SC4 = CV_MAKETYPE(CV_16S, 4);
-    {$EXTERNALSYM CV_16SC4}
+  const
+  CV_16SC3 = CV_MAKETYPE(CV_16S, 3);
+  {$EXTERNALSYM CV_16SC3}
 
-    // >> Following declaration is a macro definition!
-    const
-    CV_16SC(n)CV_MAKETYPE(CV_16S, (n));
+  const
+  CV_16SC4 = CV_MAKETYPE(CV_16S, 4);
+  {$EXTERNALSYM CV_16SC4}
 
-    const
-    CV_32SC2 = CV_MAKETYPE(CV_32S, 2);
-    {$EXTERNALSYM CV_32SC2}
+  // >> Following declaration is a macro definition!
+  const
+  CV_16SC(n)CV_MAKETYPE(CV_16S, (n));
+*)
+// const
+// CV_32SC2 = CV_MAKETYPE(CV_32S, 2);
+{$EXTERNALSYM CV_32SC2}
+function CV_32SC2: Integer; inline;
 
-    const
-    CV_32SC3 = CV_MAKETYPE(CV_32S, 3);
-    {$EXTERNALSYM CV_32SC3}
+(*
+  const
+  CV_32SC3 = CV_MAKETYPE(CV_32S, 3);
+  {$EXTERNALSYM CV_32SC3}
 
-    const
-    CV_32SC4 = CV_MAKETYPE(CV_32S, 4);
-    {$EXTERNALSYM CV_32SC4}
+  const
+  CV_32SC4 = CV_MAKETYPE(CV_32S, 4);
+  {$EXTERNALSYM CV_32SC4}
 
-    // >> Following declaration is a macro definition!
-    const
-    CV_32SC(n)CV_MAKETYPE(CV_32S, (n));
+  // >> Following declaration is a macro definition!
+  const
+  CV_32SC(n)CV_MAKETYPE(CV_32S, (n));
 
-    const
-    CV_32FC1 = CV_MAKETYPE(CV_32F, 1);
-    {$EXTERNALSYM CV_32FC1}
+  const
+  CV_32FC1 = CV_MAKETYPE(CV_32F, 1);
+  {$EXTERNALSYM CV_32FC1}
+*)
+function CV_32FC2: Integer; inline;
+{$EXTERNALSYM CV_32FC2}
+(*
+  const
+  CV_32FC3 = CV_MAKETYPE(CV_32F, 3);
+  {$EXTERNALSYM CV_32FC3}
 
-    const
-    CV_32FC2 = CV_MAKETYPE(CV_32F, 2);
-    {$EXTERNALSYM CV_32FC2}
+  const
+  CV_32FC4 = CV_MAKETYPE(CV_32F, 4);
+  {$EXTERNALSYM CV_32FC4}
 
-    const
-    CV_32FC3 = CV_MAKETYPE(CV_32F, 3);
-    {$EXTERNALSYM CV_32FC3}
+  // >> Following declaration is a macro definition!
+  const
+  CV_32FC(n)CV_MAKETYPE(CV_32F, (n));
 
-    const
-    CV_32FC4 = CV_MAKETYPE(CV_32F, 4);
-    {$EXTERNALSYM CV_32FC4}
+  const
+  CV_64FC1 = CV_MAKETYPE(CV_64F, 1);
+  {$EXTERNALSYM CV_64FC1}
 
-    // >> Following declaration is a macro definition!
-    const
-    CV_32FC(n)CV_MAKETYPE(CV_32F, (n));
+  const
+  CV_64FC2 = CV_MAKETYPE(CV_64F, 2);
+  {$EXTERNALSYM CV_64FC2}
 
-    const
-    CV_64FC1 = CV_MAKETYPE(CV_64F, 1);
-    {$EXTERNALSYM CV_64FC1}
+  const
+  CV_64FC3 = CV_MAKETYPE(CV_64F, 3);
+  {$EXTERNALSYM CV_64FC3}
 
-    const
-    CV_64FC2 = CV_MAKETYPE(CV_64F, 2);
-    {$EXTERNALSYM CV_64FC2}
+  const
+  CV_64FC4 = CV_MAKETYPE(CV_64F, 4);
+  {$EXTERNALSYM CV_64FC4}
 
-    const
-    CV_64FC3 = CV_MAKETYPE(CV_64F, 3);
-    {$EXTERNALSYM CV_64FC3}
-
-    const
-    CV_64FC4 = CV_MAKETYPE(CV_64F, 4);
-    {$EXTERNALSYM CV_64FC4}
-
-    // >> Following declaration is a macro definition!
-    const
-    CV_64FC(n)CV_MAKETYPE(CV_64F, (n));
-  *)
+  // >> Following declaration is a macro definition!
+  const
+  CV_64FC(n)CV_MAKETYPE(CV_64F, (n));
+*)
 
 const
   CV_AUTO_STEP = $7FFFFFFF;
@@ -1186,46 +1190,46 @@ type
     prev_elem: Pointer; // * pointer to previous element */
   end;
 
+  // ****************************************************************************************/
+  // *                                Operations on sequences                               */
+  // ****************************************************************************************/
+  {
+    #define  CV_SEQ_ELEM( seq, elem_type, index )                    \
+    /* assert gives some guarantee that <seq> parameter is valid */  \
+    (   assert(sizeof((seq)->first[0]) == sizeof(CvSeqBlock) &&      \
+    (seq)->elem_size == sizeof(elem_type)),                      \
+    (elem_type*)((seq)->first && (unsigned)index <               \
+    (unsigned)((seq)->first->count) ?                            \
+    (seq)->first->data + (index) * sizeof(elem_type) :           \
+    cvGetSeqElem( (CvSeq*)(seq), (index) )))
+  }
+function CV_SEQ_ELEM(seq: pCvSeq; const size_of_elem: Integer; index: Integer): Pointer; inline;
+{ #define CV_GET_SEQ_ELEM( elem_type, seq, index ) CV_SEQ_ELEM( (seq), elem_type, (index) ) }
+function CV_GET_SEQ_ELEM(const size_of_elem: Integer; seq: pCvSeq; index: Integer): Pointer; inline;
 
-  // (* ************************************************************************************** *)
-  // (* Operations on sequences *)
-  // (* ************************************************************************************** *)
-  //
-  // // >> Following declaration is a macro definition!
-  // const CV_SEQ_ELEM(seq, elem_type, index);
-  // (* assert gives some guarantee that <seq> parameter is valid *) \
-  // (Assert(SizeOf((seq)^.first[0 .. -1] of) = SizeOf(CvSeqBlock) and
-  // (seq)^.elem_size = SizeOf(elem_type = array));
-  // {$EXTERNALSYM }
-  // (elem_type(seq)^.first and (Cardinal)index < (Cardinal(seq)^.first^.count)?(seq)^.first^.data +
-  // (index)SizeOf(elem_type)cvGetSeqElem((CvSeq(seq), (index)))) = ^;
-  // {$EXTERNALSYM (elem_type(seq)^.first and (Cardinal)index <                (Cardinal(seq)^.first^.count) ?                             (seq)^.first^.data + (index)  SizeOf(elem_type)             cvGetSeqElem( (CvSeq(seq), (index) )))}
-  // // >> Following declaration is a macro definition!
-  // const CV_GET_SEQ_ELEM(elem_type, seq, index)CV_SEQ_ELEM((seq), elem_type, (index));
-  //
-  // (* Add element to sequence: *)
-  // // >> Following declaration is a macro definition!
-  // const CV_WRITE_SEQ_ELEM_VAR(elem_ptr, writer);
-  // begin if ((writer).ptr >= (writer).block_max)begin cvCreateSeqBlock(and writer); end;
-  // memcpy((writer).ptr, elem_ptr, (writer).seq^.elem_size);
-  // (writer).ptr := mod +(writer) then .seq^.elem_size; end;
-  //
-  // // >> Following declaration is a macro definition!
-  // const CV_WRITE_SEQ_ELEM(elem, writer); begin Assert((writer).seq^.elem_size = SizeOf(elem));
-  // if ((writer).ptr >= (writer).block_max)begin cvCreateSeqBlock(and writer); end;
-  // Assert((writer).ptr <= (writer).block_max - SizeOf(elem));
-  // memcpy((writer).ptr, and (elem), SizeOf(elem)); (writer).ptr := mod +SizeOf(elem) then; end;
+// (* Add element to sequence: *)
+// // >> Following declaration is a macro definition!
+// const CV_WRITE_SEQ_ELEM_VAR(elem_ptr, writer);
+// begin if ((writer).ptr >= (writer).block_max)begin cvCreateSeqBlock(and writer); end;
+// memcpy((writer).ptr, elem_ptr, (writer).seq^.elem_size);
+// (writer).ptr := mod +(writer) then .seq^.elem_size; end;
+//
+// // >> Following declaration is a macro definition!
+// const CV_WRITE_SEQ_ELEM(elem, writer); begin Assert((writer).seq^.elem_size = SizeOf(elem));
+// if ((writer).ptr >= (writer).block_max)begin cvCreateSeqBlock(and writer); end;
+// Assert((writer).ptr <= (writer).block_max - SizeOf(elem));
+// memcpy((writer).ptr, and (elem), SizeOf(elem)); (writer).ptr := mod +SizeOf(elem) then; end;
 
-  (*
-    /* Move reader position forward: */
-    #define CV_NEXT_SEQ_ELEM( elem_size, reader )                 \
-    {                                                             \
-    if( ((reader).ptr += (elem_size)) >= (reader).block_max ) \
-    {                                                         \
-    cvChangeSeqBlock( &(reader), 1 );                     \
-    }                                                         \
-    }
-  *)
+(*
+  /* Move reader position forward: */
+  #define CV_NEXT_SEQ_ELEM( elem_size, reader )                 \
+  {                                                             \
+  if( ((reader).ptr += (elem_size)) >= (reader).block_max ) \
+  {                                                         \
+  cvChangeSeqBlock( &(reader), 1 );                     \
+  }                                                         \
+  }
+*)
 procedure CV_NEXT_SEQ_ELEM(const elem_size: Integer; const Reader: TCvSeqReader); inline;
 
 // (* Move reader position backward: *)
@@ -1550,6 +1554,7 @@ type
   // #define CV_SWAP(a,b,t) ((t) = (a), (a) = (b), (b) = (t))
 procedure CV_SWAP(var a, b, t: pIplImage); inline; overload;
 procedure CV_SWAP(var a, b, t: pCvPoint2D32f); inline; overload;
+procedure CV_SWAP(var a, b, t: pCvMat); inline; overload;
 procedure CV_SWAP(var a, b, t: Pointer); inline; overload;
 
 
@@ -2024,7 +2029,7 @@ function CV_32SC1: Integer;
 function CV_MAKETYPE(depth, cn: Integer): Integer;
 // #define CV_MAT_ELEM( mat, elemtype, row, col )           \
 // (*(elemtype*)CV_MAT_ELEM_PTR_FAST( mat, row, col, sizeof(elemtype)))
-function CV_MAT_ELEM(const mat: TCvMat; const elemtype: Integer; const row, col: Integer): Pointer;
+function CV_MAT_ELEM(const mat: TCvMat; const elemsize: Integer; const row, col: Integer): Pointer;
 // #define CV_MAT_ELEM_PTR_FAST( mat, row, col, pix_size )  \
 // (assert( (unsigned)(row) < (unsigned)(mat).rows &&   \
 // (unsigned)(col) < (unsigned)(mat).cols ),   \
@@ -2043,11 +2048,16 @@ begin
   Result := Pointer(Integer(mat.data) + mat.step * row + pix_size * col);
 end;
 
-function CV_MAT_ELEM(const mat: TCvMat; const elemtype: Integer; const row, col: Integer): Pointer;
+function CV_MAT_ELEM(const mat: TCvMat; const elemsize: Integer; const row, col: Integer): Pointer;
 begin
-  Result := CV_MAT_ELEM_PTR_FAST(mat, row, col, CV_ELEM_SIZE(elemtype));
+  Result := CV_MAT_ELEM_PTR_FAST(mat, row, col, elemsize);
 end;
 
+// function CV_MAT_ELEM(const mat: TCvMat; const elemtype: Integer; const row, col: Integer): Pointer;
+// begin
+// Result := CV_MAT_ELEM_PTR_FAST(mat, row, col, CV_ELEM_SIZE(elemtype));
+// end;
+
 function CvAttrList(const attr: ppCVChar = nil; next: pCvAttrList = nil): TCvAttrList;
 begin
   Result.attr := attr;
@@ -2240,6 +2250,11 @@ begin
   b := t;
 end;
 
+procedure CV_SWAP(var a, b, t: pCvMat);
+begin
+ CV_SWAP(Pointer(a), Pointer(b), Pointer(t));
+end;
+
 procedure CV_SWAP(var a, b, t: pIplImage);
 begin
   CV_SWAP(Pointer(a), Pointer(b), Pointer(t));
@@ -2250,4 +2265,39 @@ begin
   CV_SWAP(Pointer(a), Pointer(b), Pointer(t));
 end;
 
+function CV_32SC2;
+begin
+  Result := CV_MAKETYPE(CV_32S, 2);
+end;
+
+function CV_GET_SEQ_ELEM;
+begin
+  { #define CV_GET_SEQ_ELEM( elem_type, seq, index ) CV_SEQ_ELEM( (seq), elem_type, (index) ) }
+  Result := CV_SEQ_ELEM(seq, size_of_elem, index);
+end;
+
+function CV_SEQ_ELEM(seq: pCvSeq; const size_of_elem: Integer; index: Integer): Pointer; inline;
+begin
+  Assert((SizeOf(seq^.first[0]) = SizeOf(TCvSeqBlock)) and (seq^.elem_size = size_of_elem));
+  if Assigned(seq^.first) and (index < seq^.first^.count) then
+    Result := Pointer(Integer(seq^.first^.data) + index * size_of_elem)
+  else
+    Result := cvGetSeqElem(seq, index);
+end;
+
+function CV_8UC1: Integer; inline;
+begin
+  Result := CV_MAKETYPE(CV_8U, 1);
+end;
+
+function CV_32FC2: Integer; inline;
+begin
+  Result := CV_MAKETYPE(CV_32F, 2);
+end;
+
+function CV_8UC3: Integer; inline;
+begin
+  Result := CV_MAKETYPE(CV_8U, 3);
+end;
+
 end.

include/сore/core_c.pas

@@ -1076,7 +1076,8 @@ procedure cvReleaseMemStorage(var storage: pCvMemStorage); cdecl;
 // to reuse memory allocated for the storage - cvClearSeq,cvClearSet Args: array of const
 // do not free any memory.
 // A child storage returns all the blocks to the parent when it is cleared *)
-procedure cvClearMemStorage(var storage: TCvMemStorage); cdecl;
+// CVAPI(void)  cvClearMemStorage( CvMemStorage* storage );
+procedure cvClearMemStorage(storage: pCvMemStorage); cdecl;
 //
 // (* Remember a storage "free memory" position *)
 // procedure cvSaveMemStoragePos(var storage: CvMemStorage; var pos: CvMemStoragePos);
@@ -1405,8 +1406,10 @@ const
     int line_type CV_DEFAULT(8), int shift CV_DEFAULT(0) );
   }
 procedure cvLine(img: pIplImage; pt1, pt2: TCvPoint; color: TCvScalar; thickness: Integer = 1; line_type: Integer = 8;
-  shift: Integer = 0); cdecl;
-//
+  shift: Integer = 0); cdecl; overload;
+procedure cvLine(img: pCvMat; pt1, pt2: TCvPoint; color: TCvScalar; thickness: Integer = 1; line_type: Integer = 8;
+  shift: Integer = 0); cdecl; overload;
+
 {
   /* Draws a rectangle given two opposite corners of the rectangle (pt1 & pt2),
   if thickness<0 (e.g. thickness == CV_FILLED), the filled box is drawn */
@@ -1438,7 +1441,9 @@ procedure cvRectangle(img: pIplImage; pt1, pt2: TCvPoint; color: TCvScalar; thic
   int shift CV_DEFAULT(0));
 }
 procedure cvCircle(img: pIplImage; center: TCvPoint; radius: Integer; color: TCvScalar; thickness: Integer = 1;
-  line_type: Integer = 8; shift: Integer = 0); cdecl;
+  line_type: Integer = 8; shift: Integer = 0); cdecl; overload;
+procedure cvCircle(img: pCvMat; center: TCvPoint; radius: Integer; color: TCvScalar; thickness: Integer = 1;
+  line_type: Integer = 8; shift: Integer = 0); cdecl; overload;
 
 {
   /* Draws ellipse outline, filled ellipse, elliptic arc or filled elliptic sector,
@@ -2041,8 +2046,17 @@ procedure cvSet; external Core_Dll;
 procedure cvInitFont; external Core_Dll;
 procedure cvPutText; external Core_Dll;
 
-procedure cvCircle; external Core_Dll;
-procedure cvLine; external Core_Dll;
+//procedure cvCircle; external Core_Dll;
+procedure cvCircle(img: pIplImage; center: TCvPoint; radius: Integer; color: TCvScalar; thickness: Integer = 1;
+  line_type: Integer = 8; shift: Integer = 0); external Core_Dll name 'cvCircle';
+procedure cvCircle(img: pCvMat; center: TCvPoint; radius: Integer; color: TCvScalar; thickness: Integer = 1;
+  line_type: Integer = 8; shift: Integer = 0); external Core_Dll name 'cvCircle';
+
+//procedure cvLine; external Core_Dll;
+procedure cvLine(img: pIplImage; pt1, pt2: TCvPoint; color: TCvScalar; thickness: Integer = 1; line_type: Integer = 8;
+  shift: Integer = 0); external Core_Dll name 'cvLine';
+procedure cvLine(img: pCvMat; pt1, pt2: TCvPoint; color: TCvScalar; thickness: Integer = 1; line_type: Integer = 8;
+  shift: Integer = 0); external Core_Dll name 'cvLine';
 
 procedure cvAddS; external Core_Dll;
 procedure cvCopy; external Core_Dll;

samples/LibTest/cvAddWeighted/cvSetImageROI_cvAddWeighted.dpr

@@ -8,7 +8,19 @@ program cvSetImageROI_cvAddWeighted;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvAddWeighted/cv_AddWeighted.dpr

@@ -8,7 +8,19 @@ program cv_AddWeighted;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvAnd/cv_And.dpr

@@ -8,7 +8,19 @@ program cv_And;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvCanny/cv_Canny.dpr

@@ -8,7 +8,19 @@ program cv_Canny;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvCopyMakeBorder/cv_CopyMakeBorder.dpr

@@ -8,7 +8,19 @@ program cv_CopyMakeBorder;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvCreateCameraCapture/cv_CreateCameraCapture.dpr

@@ -8,7 +8,19 @@ program cv_CreateCameraCapture;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var

samples/LibTest/cvCreateTrackbar/cv_CreateTrackbar.dpr

@@ -8,7 +8,19 @@ program cv_CreateTrackbar;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvCreateVideoWriter/cv_CreateVideoWriter.dpr

@@ -8,7 +8,19 @@ program cv_CreateVideoWriter;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvCvtColor/cv_CvtColor.dpr

@@ -8,7 +8,19 @@ program cv_CvtColor;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvCvtPixToPlane/cv_CvtPixToPlane.dpr

@@ -8,7 +8,19 @@ program cv_CvtPixToPlane;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvErode_cvDilate/cvErode_cvDilate.dpr

@@ -8,7 +8,19 @@ program cvErode_cvDilate;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvFindContours/cv_FindContours.dpr

@@ -8,7 +8,19 @@ program cv_FindContours;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvFloodFill/cv_FloodFill.dpr

@@ -8,7 +8,19 @@ program cv_FloodFill;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 // заливка области картинки цветом

samples/LibTest/cvGetSubRect/cv_GetSubRect.dpr

@@ -8,7 +8,19 @@ program cv_GetSubRect;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvHoughCircles/cv_HoughCircles.dpr

@@ -8,7 +8,19 @@ program cv_HoughCircles;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvHoughLines/cv_HoughLines2.dpr

@@ -8,7 +8,19 @@ program cv_HoughLines2;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvInRange/cv_InRangeS.dpr

@@ -8,7 +8,19 @@ program cv_InRangeS;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvInterral/cv_Integral.dpr

@@ -8,7 +8,19 @@ program cv_Integral;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\сore\core_c.pas',
+Core.types_c in '..\..\..\include\сore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\сore\core.pas'
   ;
 
 const

samples/LibTest/cvLaplace/cv_Laplace.dpr

@@ -8,7 +8,19 @@ program cv_Laplace;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvLoadImage/cv_LoadImage.dpr

@@ -7,7 +7,19 @@ program cv_LoadImage;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvLoadImage/cv_LoadImage2.dpr

@@ -8,7 +8,19 @@ program cv_LoadImage2;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvLoadVideo/cv_LoadVideo.dpr

@@ -6,7 +6,19 @@ program cv_LoadVideo;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\сore\core_c.pas',
+Core.types_c in '..\..\..\include\сore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\сore\core.pas'
   ;
 
 const

samples/LibTest/cvMatchShapes/cv_MatchShapes.dpr

@@ -8,7 +8,19 @@ program cv_MatchShapes;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvMorphologyEx/cv_MorphologyEx.dpr

@@ -8,7 +8,19 @@ program cv_MorphologyEx;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvRandInt/cv_RandInt.dpr

@@ -8,7 +8,19 @@ program cv_RandInt;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvResize/cv_Resize.dpr

@@ -8,7 +8,19 @@ program cv_Resize;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvSave/cv_Save.dpr

@@ -9,7 +9,19 @@ program cv_Save;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const
@@ -52,7 +64,7 @@ begin
     for i := 0 to matrix^.rows - 1 do
     begin
       for j := 0 to matrix^.cols - 1 do
-        Write(Format('%.0f ', [pSingle(CV_MAT_ELEM(matrix^, CV_32FC1, i, j))^]));
+        Write(Format('%.0f ', [pSingle(CV_MAT_ELEM(matrix^, SizeOf(single), i, j))^]));
       Writeln;
     end;
     Writeln;

samples/LibTest/cvSetImageROI/cv_SetImageROI.dpr

@@ -8,7 +8,19 @@ program cv_SetImageROI;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvSetImageROI/cv_SetImageROI2.dpr

@@ -8,7 +8,19 @@ program cv_SetImageROI2;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvSetMouseCallback/cv_SetMouseCallback.dpr

@@ -8,7 +8,19 @@ program cv_SetMouseCallback;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvSmooth/cv_Smooth.dpr

@@ -8,7 +8,19 @@ program cv_Smooth;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/LibTest/cvSobel/cv_Sobel.dpr

@@ -8,7 +8,19 @@ program cv_Sobel;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvSplit_cvMerge/cvSplit_cvMerge.dpr

@@ -8,7 +8,19 @@ program cvSplit_cvMerge;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvSub/cv_Sub.dpr

@@ -8,7 +8,19 @@ program cv_Sub;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvThreshold/cvThreshold_cvAdaptiveThreshold.dpr

@@ -8,7 +8,19 @@ program cvThreshold_cvAdaptiveThreshold;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvWarpAffine/cv_WarpAffine.dpr

@@ -8,7 +8,19 @@ program cv_WarpAffine;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/LibTest/cvWrapPrespective/cv_WarpPerspective.dpr

@@ -9,7 +9,19 @@ program cv_WarpPerspective;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/MultiDemo/CameraCalibrate/CameraCalibrate.dpr

@@ -19,7 +19,19 @@ program CameraCalibrate;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var
@@ -126,15 +138,15 @@ begin
           j := 0;
           while i < board_n do
           begin
-            pSingle(CV_MAT_ELEM(image_points^, CV_32FC1, i, 0))^ := corners[j].x;
-            pSingle(CV_MAT_ELEM(image_points^, CV_32FC1, i, 1))^ := corners[j].y;
-            pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 0))^ := j / board_w;
-            pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 1))^ := j div board_w;
-            pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 2))^ := 0;
+            pSingle(CV_MAT_ELEM(image_points^, SizeOf(single), i, 0))^ := corners[j].x;
+            pSingle(CV_MAT_ELEM(image_points^, SizeOf(single), i, 1))^ := corners[j].y;
+            pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 0))^ := j / board_w;
+            pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 1))^ := j div board_w;
+            pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 2))^ := 0;
             Inc(i);
             Inc(j);
           end;
-          pInteger(CV_MAT_ELEM(point_counts^, CV_32SC1, successes, 0))^ := board_n;
+          pInteger(CV_MAT_ELEM(point_counts^, SizeOf(integer), successes, 0))^ := board_n;
           Inc(successes);
         end;
       end; // end skip board_dt between chessboard capture
@@ -166,17 +178,17 @@ begin
     i := 0;
     While i < successes * board_n do
     begin
-      pSingle(CV_MAT_ELEM(image_points2^, CV_32FC1, i, 0))^ := pSingle(CV_MAT_ELEM(image_points^, CV_32FC1, i, 0))^;
-      pSingle(CV_MAT_ELEM(image_points2^, CV_32FC1, i, 1))^ := pSingle(CV_MAT_ELEM(image_points^, CV_32FC1, i, 1))^;
-      pSingle(CV_MAT_ELEM(object_points2^, CV_32FC1, i, 0))^ := pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 0))^;
-      pSingle(CV_MAT_ELEM(object_points2^, CV_32FC1, i, 1))^ := pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 1))^;
-      pSingle(CV_MAT_ELEM(object_points2^, CV_32FC1, i, 2))^ := pSingle(CV_MAT_ELEM(object_points^, CV_32FC1, i, 2))^;
+      pSingle(CV_MAT_ELEM(image_points2^, SizeOf(single), i, 0))^ := pSingle(CV_MAT_ELEM(image_points^, SizeOf(single), i, 0))^;
+      pSingle(CV_MAT_ELEM(image_points2^, SizeOf(single), i, 1))^ := pSingle(CV_MAT_ELEM(image_points^, SizeOf(single), i, 1))^;
+      pSingle(CV_MAT_ELEM(object_points2^, SizeOf(single), i, 0))^ := pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 0))^;
+      pSingle(CV_MAT_ELEM(object_points2^, SizeOf(single), i, 1))^ := pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 1))^;
+      pSingle(CV_MAT_ELEM(object_points2^, SizeOf(single), i, 2))^ := pSingle(CV_MAT_ELEM(object_points^, SizeOf(single), i, 2))^;
       Inc(i);
     end;
     i := 0;
     While i < successes do
     begin // Çäåñü âñå òå æå ÷èñëà
-      pInteger(CV_MAT_ELEM(point_counts2^, CV_32SC1, i, 0))^ := pInteger(CV_MAT_ELEM(point_counts^, CV_32SC1, i, 0))^;
+      pInteger(CV_MAT_ELEM(point_counts2^, SizeOf(Integer), i, 0))^ := pInteger(CV_MAT_ELEM(point_counts^, SizeOf(Integer), i, 0))^;
       Inc(i);
     end;
     cvReleaseMat(object_points);
@@ -192,16 +204,16 @@ begin
     // pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 1, 1))^ := 1;
     // pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 2, 2))^ := 1;
 
-    pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 0, 0))^ := 520.0;
-    pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 1, 1))^ := 520.0;
-    pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 2, 2))^ := 1;
-    pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 0, 2))^ := 70.0;
-    pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, 1, 2))^ := 70.0;
+    pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), 0, 0))^ := 520.0;
+    pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), 1, 1))^ := 520.0;
+    pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), 2, 2))^ := 1;
+    pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), 0, 2))^ := 70.0;
+    pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), 1, 2))^ := 70.0;
 
     for i := 0 to intrinsic_matrix^.rows - 1 do
     begin
       for j := 0 to intrinsic_matrix^.cols - 1 do
-        Write(Format('%.0f ', [pSingle(CV_MAT_ELEM(intrinsic_matrix^, CV_32FC1, i, j))^]));
+        Write(Format('%.0f ', [pSingle(CV_MAT_ELEM(intrinsic_matrix^, SizeOf(single), i, j))^]));
       Writeln;
     end;
     Writeln;

samples/MultiDemo/CameraCaptureFindContours/CameraCaptureAndFindContours.dpr

@@ -8,7 +8,19 @@ program CameraCaptureAndFindContours;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var

samples/MultiDemo/CameraShift/CameraShift.dpr

@@ -9,7 +9,19 @@ program CameraShift;
 uses
   System.SysUtils,
   Math,
-  {$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var

samples/MultiDemo/CameraShift/frmCamshiftdemo.dfm

@@ -1,141 +0,0 @@
-object fCamshiftdemo: TfCamshiftdemo
-  Left = 321
-  Top = 186
-  Width = 380
-  Height = 431
-  Caption = 'CAMshift demo'
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -10
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
-  KeyPreview = True
-  OldCreateOrder = False
-  OnCreate = FormCreate
-  OnDestroy = FormDestroy
-  OnKeyPress = FormKeyPress
-  PixelsPerInch = 96
-  TextHeight = 13
-  object Panel2: TPanel
-    Left = 0
-    Top = 0
-    Width = 372
-    Height = 118
-    Align = alTop
-    TabOrder = 0
-    object Label1: TLabel
-      Left = 20
-      Top = 20
-      Width = 30
-      Height = 16
-      Caption = 'Vmin'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = 'MS Sans Serif'
-      Font.Style = []
-      ParentFont = False
-    end
-    object Label2: TLabel
-      Left = 20
-      Top = 52
-      Width = 34
-      Height = 16
-      Caption = 'Vmax'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = 'MS Sans Serif'
-      Font.Style = []
-      ParentFont = False
-    end
-    object Label3: TLabel
-      Left = 20
-      Top = 89
-      Width = 30
-      Height = 16
-      Caption = 'Smin'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = 'MS Sans Serif'
-      Font.Style = []
-      ParentFont = False
-    end
-    object tbVmin: TTrackBar
-      Left = 65
-      Top = 20
-      Width = 287
-      Height = 20
-      Max = 256
-      Orientation = trHorizontal
-      PageSize = 8
-      Frequency = 16
-      Position = 0
-      SelEnd = 0
-      SelStart = 0
-      TabOrder = 0
-      TickMarks = tmBottomRight
-      TickStyle = tsAuto
-    end
-    object tbVmax: TTrackBar
-      Left = 65
-      Top = 52
-      Width = 287
-      Height = 20
-      Max = 256
-      Orientation = trHorizontal
-      PageSize = 8
-      Frequency = 16
-      Position = 0
-      SelEnd = 0
-      SelStart = 0
-      TabOrder = 1
-      TickMarks = tmBottomRight
-      TickStyle = tsAuto
-    end
-    object tbSmin: TTrackBar
-      Left = 65
-      Top = 85
-      Width = 287
-      Height = 20
-      Max = 256
-      Orientation = trHorizontal
-      PageSize = 8
-      Frequency = 16
-      Position = 0
-      SelEnd = 0
-      SelStart = 0
-      TabOrder = 2
-      TickMarks = tmBottomRight
-      TickStyle = tsAuto
-    end
-  end
-  object Panel1: TPanel
-    Left = 0
-    Top = 118
-    Width = 372
-    Height = 279
-    Align = alClient
-    TabOrder = 1
-    object formImage: TImage
-      Left = 1
-      Top = 1
-      Width = 370
-      Height = 277
-      Align = alClient
-      Stretch = True
-      OnMouseDown = formImageMouseDown
-      OnMouseMove = formImageMouseMove
-      OnMouseUp = formImageMouseUp
-    end
-  end
-  object Timer1: TTimer
-    Enabled = False
-    Interval = 200
-    OnTimer = Timer1Timer
-    Left = 480
-    Top = 40
-  end
-end

samples/MultiDemo/CameraShift/frmCamshiftdemo.pas

@@ -1,346 +0,0 @@
-unit frmCamshiftdemo;
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs,  StdCtrls, ComCtrls, ExtCtrls, Math,
-  IPL, OpenCV, frmHistogram, jpeg;
-
-type
-  TfCamshiftdemo = class(TForm)
-    Timer1: TTimer;
-    Panel2: TPanel;
-    Label1: TLabel;
-    tbVmin: TTrackBar;
-    Label2: TLabel;
-    tbVmax: TTrackBar;
-    Label3: TLabel;
-    tbSmin: TTrackBar;
-    Panel1: TPanel;
-    formImage: TImage;
-    procedure FormKeyPress(Sender: TObject; var Key: Char);
-    procedure FormDestroy(Sender: TObject);
-    procedure Timer1Timer(Sender: TObject);
-    procedure FormCreate(Sender: TObject);
-    procedure formImageMouseUp(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
-    procedure formImageMouseMove(Sender: TObject; Shift: TShiftState; X,
-      Y: Integer);
-    procedure formImageMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
-  private
-    { Private declarations }
-  public
-    { Public declarations }
-  end;
-
-var
-  fCamshiftdemo: TfCamshiftdemo;
-
-{-----------------------}
-image: pIplImage = 0;
- hsv: pIplImage = 0;
- hue: pIplImage = 0;
- mask: pIplImage = 0;
- backproject: pIplImage = 0;
- histimg: pIplImage = 0;
-hist: PCvHistogram = 0;
-
-backproject_mode: longint = 0;
-select_object: longint = 0;
-track_object: longint = 0;
-show_hist: longint = 0;
-
- origin: CvPoint;
- selection: CvRect;
- track_window: CvRect;
- track_box: CvBox2D;
- track_comp: CvConnectedComp;
-
- hdims: longint = 16;
-
-
-hranges_arr: array[0..1] of float = (0, 180);
-hranges: Pfloat = @hranges_arr;
-
-capture: PCvCapture;
-frame: PIplImage;
-color: CvScalar;
-bmp: TBitmap;
-
-{-----------------------------}
-
-sector_data : array[0..5] of array[0..2] of longint =
-((0,2,1), (1,2,0), (1,0,2), (2,0,1), (2,1,0), (0,1,2));
-
-{*************************************************************************}
-implementation
-
-{$R *.dfm}
-
-
-
-
-
-
-function hsv2rgb(hue: float ): CvScalar ;
-var
-    rgb : array[0..2] of longint;
-    p, sector: longint;
-//    sector_data : array[0..5] of array[0..2] of longint;
-begin
-    hue := hue * 0.033333333333333333333333333333333;
-    sector := cvFloor(hue);
-    p := cvRound(255*(hue - sector));
-    if (sector and 1) <> 0 then
-        p := p xor 255
-    else
-        p := p xor 0;
-
-    rgb[sector_data[sector][0]] := 255;
-    rgb[sector_data[sector][1]] := 0;
-    rgb[sector_data[sector][2]] := p;
-
-    result := cvScalar_(rgb[2], rgb[1], rgb[0], 0);
-end;
-
-
-
-procedure main_cycle();
-var
-        i, bin_w: integer;
-        _vmin, _vmax: integer;
-        max_val: float;
-        val: integer ;
-        cs: CvSize;
-        rec: TRect;
-begin
-    begin
-        frame := cvQueryFrame( capture );
-        if not(assigned(frame) ) then
-            exit;
-
-        if not(assigned(image) ) then
-        begin
-            //* allocate all the buffers */
-            cs.width := frame.Width;
-            cs.height := frame.Height;
-            image := cvCreateImage( cs, 8, 3 );
-            image.Origin := frame.Origin;
-            hsv := cvCreateImage( cs, 8, 3 );
-            hue := cvCreateImage( cs, 8, 1 );
-            mask := cvCreateImage( cs, 8, 1 );
-            backproject := cvCreateImage( cs, 8, 1 );
-            hist := cvCreateHist( 1, @hdims, CV_HIST_ARRAY, @hranges, 1 );
-            histimg := cvCreateImage( cvSize_(320,200), 8, 3 );
-            cvZero( histimg );
-        end;
-
-        cvCopy( frame, image, 0 );
-        cvCvtColor( image, hsv, CV_BGR2HSV );
-
-        if( track_object <> 0 ) then
-        begin
-            _vmin := fCamshiftdemo.tbVmin.Position;
-            _vmax := fCamshiftdemo.tbVmax.Position;
-
-            cvInRangeS( hsv, cvScalar_(0, fCamshiftdemo.tbSmin.Position,
-                        MIN(_vmin,_vmax),0),
-                        cvScalar_(180,256,MAX(_vmin,_vmax),0), mask );
-            cvSplit( hsv, hue, 0, 0, 0 );
-
-            if( track_object < 0 ) then
-            begin
-                max_val := 0.0;
-                cvSetImageROI( hue, selection );
-                cvSetImageROI( mask, selection );
-                cvCalcHist( longint(@hue), hist, 0, mask );
-                cvGetMinMaxHistValue( hist, 0, @max_val, 0, 0 );
-                if (max_val <> 0) then
-                   cvConvertScale( hist^.bins, hist^.bins, (255.0 / max_val), 0 )
-                else
-                        cvConvertScale( hist^.bins, hist^.bins, 0.0, 0 );
-                // cvConvertScale( hist^.bins, hist^.bins, max_val ? 255. / max_val : 0., 0 );
-                cvResetImageROI( hue );
-                cvResetImageROI( mask );
-                track_window := selection;
-                track_object := 1;
-
-                cvZero( histimg );
-                bin_w := round(histimg^.Width / hdims);
-                for i := 0 to hdims-1 do
-                begin
-                    val := cvRound( cvGetReal1D(hist^.bins,i)*histimg^.Height/255 );
-                    color := hsv2rgb(i*180.0/hdims);
-                    cvRectangle( histimg, cvPoint_(i * bin_w, histimg^.height),
-                                 cvPoint_( (i+1) * bin_w, histimg^.height - val),
-                                 color, -1, 8, 0 );
-                end;
-            end;
-
-            cvCalcBackProject( @hue, backproject, hist );
-            cvAnd( backproject, mask, backproject, 0 );
-            cvCamShift( backproject, track_window,
-                        cvTermCriteria_( (CV_TERMCRIT_EPS or CV_TERMCRIT_ITER), 10, 1 ),
-                        @track_comp, @track_box );
-            track_window := track_comp.rect;
-
-            if( backproject_mode <> 0 ) then
-                cvCvtColor( backproject, image, CV_GRAY2BGR );
-            if( image.Origin <> IPL_ORIGIN_TL ) then
-                track_box.angle := -track_box.angle;
-            {draw an ellipse around the tracked object}
-            cvEllipseBox( image, track_box, CV_RGB(255,0,0), 3, CV_AA, 0 );
-        end;
-
-        {draw a rectangle on the area selected with mouse}
-        if( select_object >0) and ( selection.width > 0) and ( selection.height > 0 ) then
-        begin
-            cvSetImageROI( image, selection );
-            cvXorS( image, cvScalarAll(255), image, 0 );
-            cvResetImageROI( image );
-        end;
-
-        {visualize the camera image in the window}
-        IplImage2Bitmap(image, bmp);
-        rec := fCamshiftdemo.formImage.canvas.ClipRect;
-        fCamshiftdemo.formImage.canvas.StretchDraw(rec , bmp);
-
-       if (show_hist <> 0) then
-       begin
-        IplImage2Bitmap(histimg, bmp);
-        fHistogram.histimage.canvas.StretchDraw(fHistogram.histimage.canvas.ClipRect , bmp);
-       end;
-    end;
-end;
-
-procedure TfCamshiftdemo.FormCreate(Sender: TObject);
-begin
-        capture := cvCaptureFromCAM( 0);
-    //    capture = cvCaptureFromAVI( argv[1] );
-
-    if not(assigned(capture ))  then
-    begin
-        MessageDlg('Could not initialize capturing from camera!!', mtError, [mbOK], 0);
-        halt;
-    end;
-
-//    printf( "Hot keys: \n"
-//        "\tESC - quit the program\n"
-//        "\tc - stop the tracking\n"
-//        "\tb - switch to/from backprojection view\n"
-//        "\th - show/hide object histogram\n"
-//        "To initialize tracking, select the object with mouse\n" );
-
-        tbVmin.Position := 10;
-        tbVmax.Position := 256;
-        tbSmin.Position := 30;
-        bmp := TBitmap.Create;
-        bmp.PixelFormat :=  pf24bit;
-       timer1.enabled := true;
-end;
-
-procedure TfCamshiftdemo.FormKeyPress(Sender: TObject; var Key: Char);
-begin
-        if( key = char(27) ) then
-        begin
-            self.Destroy;
-            halt;
-        end;
-        case key of
-        'b':
-            backproject_mode := backproject_mode xor 1;
-        'c': begin
-                track_object := 0;
-                cvZero( histimg );
-            end;
-        'h':
-            begin
-            show_hist :=  show_hist xor 1;
-            if (show_hist=0) then
-                fHistogram.Free
-            else
-            begin
-                fHistogram := TfHistogram.Create(self);
-                fHistogram.Show;
-            end;
-            end;
-        else
-            ;
-        end;
-
-end;
-
-procedure TfCamshiftdemo.FormDestroy(Sender: TObject);
-begin
-    cvReleaseCapture( @capture );
-    if assigned(fHistogram) then
-        fHistogram.Destroy;
-end;
-
-procedure TfCamshiftdemo.Timer1Timer(Sender: TObject);
-begin
-        main_cycle;
-        application.HandleMessage;
-end;
-
-
-procedure TfCamshiftdemo.formImageMouseDown(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-var
-        xConv, yConv: integer;
-begin
-    {convert x and y mouse coords to OpenCV image coords}
-    xConv := round(x *(image.Width / formImage.Width));
-    if( image.Origin <> IPL_ORIGIN_TL ) then
-        y :=  formImage.Height - y;
-    yConv := round(y *(image.Height / formImage.Height));
-    origin := cvPoint_(xConv ,yConv );
-    selection := cvRect_(xConv,yConv,0,0);
-    select_object := 1;
-end;
-
-procedure TfCamshiftdemo.formImageMouseMove(Sender: TObject;
-  Shift: TShiftState; X, Y: Integer);
-var
-        xConv, yConv: integer;
-begin
-
-    if not(assigned(image )) or (select_object =0 ) then
-        // nop
-    else
-    begin
-
-        {convert x and y mouse coords to OpenCV image coords}
-        xConv := round(x *(image.Width / formImage.Width));
-        if( image.Origin <> IPL_ORIGIN_TL ) then
-            y :=  formImage.Height - y;
-        yConv := round(y *(image.Height / formImage.Height));
-
-        begin
-            selection.x := MIN(xConv, origin.x);
-            selection.y := MIN(yConv, origin.y);
-            selection.width := ABS(xConv - origin.x);
-            selection.height := ABS(yConv - origin.y);
-            selection.x := MAX( selection.x, 0 );
-            selection.y := MAX( selection.y, 0 );
-            selection.width := MIN( selection.width, image.Width );
-            selection.height := MIN( selection.height, image.Height );
-
-        end;
-     end;
-end;
-
-procedure TfCamshiftdemo.formImageMouseUp(Sender: TObject;
-  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-begin
-        select_object := 0;
-        if( selection.width > 0) and (selection.height > 0 ) then
-            track_object := -1;
-
-end;
-
-{**********************************************************************}
-
-end.

samples/MultiDemo/FaceDetect/FaceDetect.dpr

@@ -9,7 +9,19 @@ program FaceDetect;
 uses
   System.Character,
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var
@@ -35,7 +47,7 @@ begin
   // Create a new image based on the input image
   temp := cvCreateImage(cvSize(image^.width div scale, image^.height div scale), 8, 3);
   // Clear the memory storage which was used before
-  cvClearMemStorage(storage^);
+  cvClearMemStorage(storage);
 
   // Find whether the cascade is loaded, to find the faces. If yes, then:
   if Assigned(cascade) then

samples/MultiDemo/FaceDetect/FaceDetect.dproj

@@ -72,6 +72,19 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
+        <DCCReference Include="..\..\..\include\uLibName.pas"/>
+        <DCCReference Include="..\..\..\include\highgui\highgui_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\Core.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc_c.pas"/>
+        <DCCReference Include="..\..\..\include\legacy\legacy.pas"/>
+        <DCCReference Include="..\..\..\include\calib3d\calib3d.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\haar.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\objdetect.pas"/>
+        <DCCReference Include="..\..\..\include\video\tracking.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

samples/MultiDemo/HandsDetect/HandsDetect.dpr

@@ -10,7 +10,19 @@ program HandsDetect;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/MultiDemo/Hello World/HelloWorld.dpr

@@ -8,7 +8,19 @@ program HelloWorld;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Var

samples/MultiDemo/Squares/Squares.dpr

@@ -8,7 +8,19 @@ program Squares;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const
@@ -217,7 +229,7 @@ begin
     cvWaitKey;
     cvReleaseImage(img);
     cvReleaseImage(img0);
-    cvClearMemStorage(storage^);
+    cvClearMemStorage(storage);
 
   except
     on E: Exception do

samples/MultiDemo/Squares/Squares.dproj

@@ -72,6 +72,19 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
+        <DCCReference Include="..\..\..\include\uLibName.pas"/>
+        <DCCReference Include="..\..\..\include\highgui\highgui_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\Core.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc_c.pas"/>
+        <DCCReference Include="..\..\..\include\legacy\legacy.pas"/>
+        <DCCReference Include="..\..\..\include\calib3d\calib3d.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\haar.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\objdetect.pas"/>
+        <DCCReference Include="..\..\..\include\video\tracking.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core.pas"/>
         <BuildConfiguration Include="Debug">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

samples/MultiDemo/Stereo/Stereo.dpr

@@ -8,7 +8,19 @@ program Stereo;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 Const

samples/MultiDemo/VideoProcessing/VideoProcessing.dpr

@@ -7,7 +7,19 @@ program VideoProcessing;
 
 uses
   System.SysUtils,
-{$I ..\..\uses_include.inc}
+uLibName in '..\..\..\include\uLibName.pas',
+highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+core_c in '..\..\..\include\ñore\core_c.pas',
+Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+legacy in '..\..\..\include\legacy\legacy.pas',
+calib3d in '..\..\..\include\calib3d\calib3d.pas',
+imgproc in '..\..\..\include\imgproc\imgproc.pas',
+haar in '..\..\..\include\objdetect\haar.pas',
+objdetect in '..\..\..\include\objdetect\objdetect.pas',
+tracking in '..\..\..\include\video\tracking.pas',
+Core in '..\..\..\include\ñore\core.pas'
   ;
 
 const

samples/MultiDemo/fback/fback_c.dpr

@@ -0,0 +1,104 @@
+{$APPTYPE CONSOLE}
+{$POINTERMATH ON}
+// JCL_DEBUG_EXPERT_GENERATEJDBG OFF
+// JCL_DEBUG_EXPERT_INSERTJDBG OFF
+// JCL_DEBUG_EXPERT_DELETEMAPFILE OFF
+program fback_c;
+
+{$R *.res}
+
+uses
+  System.SysUtils,
+  uLibName in '..\..\..\include\uLibName.pas',
+  highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+  core_c in '..\..\..\include\ñore\core_c.pas',
+  Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+  imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+  imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+  legacy in '..\..\..\include\legacy\legacy.pas',
+  calib3d in '..\..\..\include\calib3d\calib3d.pas',
+  imgproc in '..\..\..\include\imgproc\imgproc.pas',
+  haar in '..\..\..\include\objdetect\haar.pas',
+  objdetect in '..\..\..\include\objdetect\objdetect.pas',
+  tracking in '..\..\..\include\video\tracking.pas',
+  Core in '..\..\..\include\ñore\core.pas';
+
+procedure drawOptFlowMap(const flow: pCvMat; cflowmap: pCvMat; step: Integer; scale: double; color: TCvScalar);
+Var
+  x, y: Integer;
+  fxy: TCvPoint2D32f;
+begin
+  y := 0;
+  While y < cflowmap^.rows do
+  begin
+    x := 0;
+    while x < cflowmap^.cols do
+    begin
+      fxy := pCvPoint2D32f(CV_MAT_ELEM(flow^, SizeOf(TCvPoint2D32f), y, x))^;
+      cvLine(cflowmap, cvPoint(x, y), cvPoint(cvRound(x + fxy.x), cvRound(y + fxy.y)), color, 1, 8, 0);
+      cvCircle(cflowmap, cvPoint(x, y), 2, color, -1, 8, 0);
+      x := x + step;
+    end;
+    y := y + step;
+  end;
+end;
+
+Var
+  capture: pCvCapture;
+  prevgray: pCvMat = nil;
+  gray: pCvMat = nil;
+  flow: pCvMat = nil;
+  cflow: pCvMat = nil;
+  firstFrame: boolean;
+  frame: pIplImage;
+  temp: pCvMat;
+
+begin
+  try
+    Writeln(' This program demonstrate dense Farneback optical flow');
+    Writeln('It read from camera 0, and shows how to use and display dense Franeback optical flow');
+    Writeln('Usage: ');
+    Writeln('fback_c ');
+
+    capture := cvCreateCameraCapture(0);
+    Assert(Assigned(capture));
+
+    cvNamedWindow('flow', 1);
+    while true do
+    begin
+      firstFrame := Assigned(gray);
+
+      frame := cvQueryFrame(capture);
+      Assert(Assigned(frame));
+
+      if not Assigned(gray) then
+      begin
+        gray := cvCreateMat(frame^.height, frame^.width, CV_8UC1);
+        prevgray := cvCreateMat(gray^.rows, gray^.cols, gray^._type);
+        flow := cvCreateMat(gray^.rows, gray^.cols, CV_32FC2);
+        cflow := cvCreateMat(gray^.rows, gray^.cols, CV_8UC3);
+      end;
+      cvCvtColor(frame, gray, CV_BGR2GRAY);
+
+      if firstFrame then
+      begin
+        cvCalcOpticalFlowFarneback(prevgray, gray, flow, 0.5, 3, 15, 3, 5, 1.2, 0);
+        cvCvtColor(prevgray, cflow, CV_GRAY2BGR);
+        drawOptFlowMap(flow, cflow, 16, 1.5, CV_RGB(0, 255, 0));
+        cvShowImage('flow', cflow);
+      end;
+
+      if (cvWaitKey(10) = 27) then
+        break;
+
+      CV_SWAP(prevgray, gray, temp);
+
+    end;
+    cvReleaseCapture(capture);
+
+  except
+    on E: Exception do
+      Writeln(E.ClassName, ': ', E.Message);
+  end;
+
+end.

samples/MultiDemo/fback/fback_c.dproj

@@ -0,0 +1,161 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{80AFD0AA-BC0D-4D1D-869A-AF8111F8BBDB}</ProjectGuid>
+        <MainSource>fback_c.dpr</MainSource>
+        <Base>True</Base>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <TargetedPlatforms>1</TargetedPlatforms>
+        <AppType>Console</AppType>
+        <FrameworkType>None</FrameworkType>
+        <ProjectVersion>14.4</ProjectVersion>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <DCC_ImageBase>00400000</DCC_ImageBase>
+        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_S>false</DCC_S>
+        <DCC_F>false</DCC_F>
+        <DCC_K>false</DCC_K>
+        <Manifest_File>None</Manifest_File>
+        <DCC_E>false</DCC_E>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
+        <DCC_ExeOutput>..\..\..\bin\</DCC_ExeOutput>
+        <DCC_N>false</DCC_N>
+        <VerInfo_Locale>1049</VerInfo_Locale>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_DebugInformation>false</DCC_DebugInformation>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+        <DCC_Optimize>false</DCC_Optimize>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <Manifest_File>None</Manifest_File>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="..\..\..\include\uLibName.pas"/>
+        <DCCReference Include="..\..\..\include\highgui\highgui_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\Core.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc_c.pas"/>
+        <DCCReference Include="..\..\..\include\legacy\legacy.pas"/>
+        <DCCReference Include="..\..\..\include\calib3d\calib3d.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\haar.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\objdetect.pas"/>
+        <DCCReference Include="..\..\..\include\video\tracking.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core.pas"/>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">fback_c.dpr</Source>
+                </Source>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="MajorVer">1</VersionInfo>
+                    <VersionInfo Name="MinorVer">0</VersionInfo>
+                    <VersionInfo Name="Release">0</VersionInfo>
+                    <VersionInfo Name="Build">0</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">1049</VersionInfo>
+                    <VersionInfo Name="CodePage">1251</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="FileDescription"/>
+                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName"/>
+                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                    <VersionInfoKeys Name="CFBundleName"/>
+                    <VersionInfoKeys Name="CFBundleDisplayName"/>
+                    <VersionInfoKeys Name="CFBundleIdentifier"/>
+                    <VersionInfoKeys Name="CFBundleVersion"/>
+                    <VersionInfoKeys Name="CFBundlePackageType"/>
+                    <VersionInfoKeys Name="CFBundleSignature"/>
+                    <VersionInfoKeys Name="CFBundleAllowMixedLocalizations"/>
+                    <VersionInfoKeys Name="CFBundleExecutable"/>
+                </VersionInfoKeys>
+            </Delphi.Personality>
+            <Platforms>
+                <Platform value="OSX32">False</Platform>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">False</Platform>
+            </Platforms>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+</Project>
+
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=7001
+DeleteMapAfterCompile=1
+Encrypt Password=""
+EurekaLog Last Line -->

samples/MultiDemo/minarea/minarea.dpr

@@ -0,0 +1,132 @@
+{$APPTYPE CONSOLE}
+{$POINTERMATH ON}
+// JCL_DEBUG_EXPERT_GENERATEJDBG OFF
+// JCL_DEBUG_EXPERT_INSERTJDBG OFF
+// JCL_DEBUG_EXPERT_DELETEMAPFILE OFF
+program minarea;
+
+{$R *.res}
+
+uses
+  System.SysUtils,
+  uLibName in '..\..\..\include\uLibName.pas',
+  highgui_c in '..\..\..\include\highgui\highgui_c.pas',
+  core_c in '..\..\..\include\ñore\core_c.pas',
+  Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
+  imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
+  imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
+  legacy in '..\..\..\include\legacy\legacy.pas',
+  calib3d in '..\..\..\include\calib3d\calib3d.pas',
+  imgproc in '..\..\..\include\imgproc\imgproc.pas',
+  haar in '..\..\..\include\objdetect\haar.pas',
+  objdetect in '..\..\..\include\objdetect\objdetect.pas',
+  tracking in '..\..\..\include\video\tracking.pas',
+  Core in '..\..\..\include\ñore\core.pas';
+
+{$DEFINE ARRAY }
+
+Var
+  img: pIplImage;
+{$IFNDEF ARRAY}
+  storage: pCvMemStorage;
+{$ELSE}
+  points: pCvPoint;
+  pointMat: TCvMat;
+{$ENDIF}
+  key: Integer;
+  i: Integer;
+  count: Integer;
+  pt0, pt: TCvPoint;
+  box: TCvBox2D;
+  box_vtx: TBoxPoints;
+  center: TCvPoint2D32f;
+  icenter: TCvPoint;
+  radius: Single;
+  ptseq: pCvSeq;
+
+begin
+  try
+    WriteLn('This program demonstrates finding the minimum enclosing box or circle of a set');
+    WriteLn('of points using functions: minAreaRect() minEnclosingCircle().');
+    WriteLn('Random points are generated and then enclosed.');
+    WriteLn('Call:');
+    WriteLn('minarea');
+
+    img := cvCreateImage( cvSize( 500, 500 ), 8, 3 );
+
+{$IFNDEF ARRAY}
+    storage := cvCreateMemStorage(0);
+{$ENDIF}
+    cvNamedWindow('rect & circle', 1);
+    While True do
+    begin
+      count := random(100) + 1;
+{$IFNDEF ARRAY}
+      ptseq := cvCreateSeq(CV_SEQ_KIND_GENERIC or CV_32SC2, sizeof(TCvContour), sizeof(TCvPoint), storage);
+      for i := 0 to count - 1 do
+      begin
+        pt0.x := random(img^.width div 2) + img^.width div 4;
+        pt0.y := random(img^.height div 2) + img^.height div 4;
+        cvSeqPush(ptseq, @pt0);
+      end;
+{$IFNDEF _EiC} // * unfortunately, here EiC crashes */
+      box := cvMinAreaRect2(ptseq);
+{$ENDIF}
+      cvMinEnclosingCircle(ptseq, @center, @radius);
+{$ELSE}
+      points := Allocmem(count * sizeof(TCvPoint));
+      pointMat := cvMat(1, count, CV_32SC2, points);
+      for i := 0 to count - 1 do
+      begin
+        pt0.x := random(img^.width div 2) + img^.width div 4;
+        pt0.y := random(img^.height div 2) + img^.height div 4;
+        points[i] := pt0;
+      end;
+{$IFNDEF _EiC}
+      box := cvMinAreaRect2(@pointMat, 0);
+{$ENDIF}
+      cvMinEnclosingCircle(@pointMat, @center, @radius);
+{$ENDIF}
+      cvBoxPoints(box, box_vtx);
+      cvZero(img);
+      for i := 0 to count - 1 do
+      begin
+{$IFNDEF ARRAY}
+        pt0 := pCvPoint(CV_GET_SEQ_ELEM(SizeOf(TCvPoint), ptseq, i))^;
+{$ELSE}
+        pt0 := points[i];
+{$ENDIF}
+        cvCircle(img, pt0, 2, CV_RGB(255, 0, 0), CV_FILLED, CV_AA, 0);
+      end;
+{$IFNDEF _EiC}
+      pt0.x := cvRound(box_vtx[3].x);
+      pt0.y := cvRound(box_vtx[3].y);
+      for i := 0 to 3 do
+      begin
+        pt.x := cvRound(box_vtx[i].x);
+        pt.y := cvRound(box_vtx[i].y);
+        cvLine(img, pt0, pt, CV_RGB(0, 255, 0), 1, CV_AA, 0);
+        pt0 := pt;
+      end;
+{$ENDIF}
+      icenter.x := cvRound(center.x);
+      icenter.y := cvRound(center.y);
+      cvCircle(img, icenter, cvRound(radius), CV_RGB(255, 255, 0), 1, CV_AA, 0);
+
+      cvShowImage('rect & circle', img);
+
+      if cvWaitKey(0) = 27 then
+        Break;
+{$IFNDEF ARRAY}
+      cvClearMemStorage(storage);
+{$ELSE}
+      freemem(points);
+{$ENDIF}
+    end;
+    cvDestroyWindow('rect & circle');
+  except
+    on E: Exception do
+      WriteLn(E.ClassName, ': ', E.Message);
+  end;
+
+end.

samples/MultiDemo/minarea/minarea.dproj

@@ -0,0 +1,161 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{C8408868-8907-48A6-95E3-6E11A3C694BB}</ProjectGuid>
+        <MainSource>minarea.dpr</MainSource>
+        <Base>True</Base>
+        <Config Condition="'$(Config)'==''">Debug</Config>
+        <TargetedPlatforms>1</TargetedPlatforms>
+        <AppType>Console</AppType>
+        <FrameworkType>None</FrameworkType>
+        <ProjectVersion>14.4</ProjectVersion>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
+        <Base_Win32>true</Base_Win32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
+        <Cfg_1>true</Cfg_1>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
+        <Cfg_2>true</Cfg_2>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+        <Cfg_2_Win32>true</Cfg_2_Win32>
+        <CfgParent>Cfg_2</CfgParent>
+        <Cfg_2>true</Cfg_2>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base)'!=''">
+        <DCC_ImageBase>00400000</DCC_ImageBase>
+        <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
+        <DCC_S>false</DCC_S>
+        <DCC_F>false</DCC_F>
+        <DCC_K>false</DCC_K>
+        <Manifest_File>None</Manifest_File>
+        <DCC_E>false</DCC_E>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=;CFBundleDisplayName=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;CFBundleExecutable=</VerInfo_Keys>
+        <DCC_ExeOutput>..\..\..\bin\</DCC_ExeOutput>
+        <DCC_N>false</DCC_N>
+        <VerInfo_Locale>1049</VerInfo_Locale>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win32)'!=''">
+        <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_1)'!=''">
+        <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
+        <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
+        <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+        <DCC_DebugInformation>false</DCC_DebugInformation>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2)'!=''">
+        <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
+        <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
+        <DCC_Optimize>false</DCC_Optimize>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+        <Manifest_File>None</Manifest_File>
+        <VerInfo_Locale>1033</VerInfo_Locale>
+        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    </PropertyGroup>
+    <ItemGroup>
+        <DelphiCompile Include="$(MainSource)">
+            <MainSource>MainSource</MainSource>
+        </DelphiCompile>
+        <DCCReference Include="..\..\..\include\uLibName.pas"/>
+        <DCCReference Include="..\..\..\include\highgui\highgui_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core_c.pas"/>
+        <DCCReference Include="..\..\..\include\сore\Core.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.types_c.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc_c.pas"/>
+        <DCCReference Include="..\..\..\include\legacy\legacy.pas"/>
+        <DCCReference Include="..\..\..\include\calib3d\calib3d.pas"/>
+        <DCCReference Include="..\..\..\include\imgproc\imgproc.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\haar.pas"/>
+        <DCCReference Include="..\..\..\include\objdetect\objdetect.pas"/>
+        <DCCReference Include="..\..\..\include\video\tracking.pas"/>
+        <DCCReference Include="..\..\..\include\сore\core.pas"/>
+        <BuildConfiguration Include="Debug">
+            <Key>Cfg_2</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Base">
+            <Key>Base</Key>
+        </BuildConfiguration>
+        <BuildConfiguration Include="Release">
+            <Key>Cfg_1</Key>
+            <CfgParent>Base</CfgParent>
+        </BuildConfiguration>
+    </ItemGroup>
+    <ProjectExtensions>
+        <Borland.Personality>Delphi.Personality.12</Borland.Personality>
+        <Borland.ProjectType/>
+        <BorlandProject>
+            <Delphi.Personality>
+                <Source>
+                    <Source Name="MainSource">minarea.dpr</Source>
+                </Source>
+                <VersionInfo>
+                    <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
+                    <VersionInfo Name="AutoIncBuild">False</VersionInfo>
+                    <VersionInfo Name="MajorVer">1</VersionInfo>
+                    <VersionInfo Name="MinorVer">0</VersionInfo>
+                    <VersionInfo Name="Release">0</VersionInfo>
+                    <VersionInfo Name="Build">0</VersionInfo>
+                    <VersionInfo Name="Debug">False</VersionInfo>
+                    <VersionInfo Name="PreRelease">False</VersionInfo>
+                    <VersionInfo Name="Special">False</VersionInfo>
+                    <VersionInfo Name="Private">False</VersionInfo>
+                    <VersionInfo Name="DLL">False</VersionInfo>
+                    <VersionInfo Name="Locale">1049</VersionInfo>
+                    <VersionInfo Name="CodePage">1251</VersionInfo>
+                </VersionInfo>
+                <VersionInfoKeys>
+                    <VersionInfoKeys Name="CompanyName"/>
+                    <VersionInfoKeys Name="FileDescription"/>
+                    <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="InternalName"/>
+                    <VersionInfoKeys Name="LegalCopyright"/>
+                    <VersionInfoKeys Name="LegalTrademarks"/>
+                    <VersionInfoKeys Name="OriginalFilename"/>
+                    <VersionInfoKeys Name="ProductName"/>
+                    <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
+                    <VersionInfoKeys Name="Comments"/>
+                    <VersionInfoKeys Name="CFBundleName"/>
+                    <VersionInfoKeys Name="CFBundleDisplayName"/>
+                    <VersionInfoKeys Name="CFBundleIdentifier"/>
+                    <VersionInfoKeys Name="CFBundleVersion"/>
+                    <VersionInfoKeys Name="CFBundlePackageType"/>
+                    <VersionInfoKeys Name="CFBundleSignature"/>
+                    <VersionInfoKeys Name="CFBundleAllowMixedLocalizations"/>
+                    <VersionInfoKeys Name="CFBundleExecutable"/>
+                </VersionInfoKeys>
+            </Delphi.Personality>
+            <Platforms>
+                <Platform value="OSX32">False</Platform>
+                <Platform value="Win32">True</Platform>
+                <Platform value="Win64">False</Platform>
+            </Platforms>
+        </BorlandProject>
+        <ProjectFileVersion>12</ProjectFileVersion>
+    </ProjectExtensions>
+    <Import Project="$(BDS)\Bin\CodeGear.Delphi.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')"/>
+    <Import Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj" Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')"/>
+</Project>
+
+<!-- EurekaLog First Line
+[Exception Log]
+EurekaLog Version=7001
+DeleteMapAfterCompile=1
+Encrypt Password=""
+EurekaLog Last Line -->

samples/Samples.groupproj

@@ -147,6 +147,12 @@
         <Projects Include="MultiDemo\CameraShift\CameraShift.dproj">
             <Dependencies/>
         </Projects>
+        <Projects Include="MultiDemo\minarea\minarea.dproj">
+            <Dependencies/>
+        </Projects>
+        <Projects Include="MultiDemo\fback\fback_c.dproj">
+            <Dependencies/>
+        </Projects>
         <Projects Include="MultiDemo\MoveDetect\MoveDetect.dproj">
             <Dependencies/>
         </Projects>
@@ -590,6 +596,24 @@
     <Target Name="CameraShift:Make">
         <MSBuild Projects="MultiDemo\CameraShift\CameraShift.dproj" Targets="Make"/>
     </Target>
+    <Target Name="minarea">
+        <MSBuild Projects="MultiDemo\minarea\minarea.dproj"/>
+    </Target>
+    <Target Name="minarea:Clean">
+        <MSBuild Projects="MultiDemo\minarea\minarea.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="minarea:Make">
+        <MSBuild Projects="MultiDemo\minarea\minarea.dproj" Targets="Make"/>
+    </Target>
+    <Target Name="fback_c">
+        <MSBuild Projects="MultiDemo\fback\fback_c.dproj"/>
+    </Target>
+    <Target Name="fback_c:Clean">
+        <MSBuild Projects="MultiDemo\fback\fback_c.dproj" Targets="Clean"/>
+    </Target>
+    <Target Name="fback_c:Make">
+        <MSBuild Projects="MultiDemo\fback\fback_c.dproj" Targets="Make"/>
+    </Target>
     <Target Name="MoveDetect">
         <MSBuild Projects="MultiDemo\MoveDetect\MoveDetect.dproj"/>
     </Target>
@@ -600,13 +624,13 @@
         <MSBuild Projects="MultiDemo\MoveDetect\MoveDetect.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">
-        <CallTarget Targets="cv_AddWeighted;cvSetImageROI_cvAddWeighted;cv_And;cv_Canny;cv_CopyMakeBorder;cv_CreateCameraCapture;cv_CreateTrackbar;cv_CreateVideoWriter;cv_CvtColor;cv_CvtPixToPlane;cvErode_cvDilate;cv_FindContours;cv_FloodFill;cv_GetSubRect;cv_HoughCircles;cv_HoughLines2;cv_InRangeS;cv_Laplace;cv_LoadImage;cv_LoadImage2;cv_LoadVideo;cv_MorphologyEx;cv_RandInt;cv_Resize;cv_SetImageROI;cv_SetImageROI2;cv_SetMouseCallback;cv_Smooth;cv_Sobel;cvSplit_cvMerge;cv_Save;cv_Sub;cvThreshold_cvAdaptiveThreshold;cv_Integral;cv_WarpPerspective;cv_MatchShapes;cv_WarpAffine;cv_SnakeImage;cv_CalcOpticalFlowPyrLK;HelloWorld;VideoProcessing;FaceDetect;Stereo;CameraCaptureAndFindContours;HandsDetect;Squares;CameraCalibrate;CameraShift;MoveDetect"/>
+        <CallTarget Targets="cv_AddWeighted;cvSetImageROI_cvAddWeighted;cv_And;cv_Canny;cv_CopyMakeBorder;cv_CreateCameraCapture;cv_CreateTrackbar;cv_CreateVideoWriter;cv_CvtColor;cv_CvtPixToPlane;cvErode_cvDilate;cv_FindContours;cv_FloodFill;cv_GetSubRect;cv_HoughCircles;cv_HoughLines2;cv_InRangeS;cv_Laplace;cv_LoadImage;cv_LoadImage2;cv_LoadVideo;cv_MorphologyEx;cv_RandInt;cv_Resize;cv_SetImageROI;cv_SetImageROI2;cv_SetMouseCallback;cv_Smooth;cv_Sobel;cvSplit_cvMerge;cv_Save;cv_Sub;cvThreshold_cvAdaptiveThreshold;cv_Integral;cv_WarpPerspective;cv_MatchShapes;cv_WarpAffine;cv_SnakeImage;cv_CalcOpticalFlowPyrLK;HelloWorld;VideoProcessing;FaceDetect;Stereo;CameraCaptureAndFindContours;HandsDetect;Squares;CameraCalibrate;CameraShift;minarea;fback_c;MoveDetect"/>
     </Target>
     <Target Name="Clean">
-        <CallTarget Targets="cv_AddWeighted:Clean;cvSetImageROI_cvAddWeighted:Clean;cv_And:Clean;cv_Canny:Clean;cv_CopyMakeBorder:Clean;cv_CreateCameraCapture:Clean;cv_CreateTrackbar:Clean;cv_CreateVideoWriter:Clean;cv_CvtColor:Clean;cv_CvtPixToPlane:Clean;cvErode_cvDilate:Clean;cv_FindContours:Clean;cv_FloodFill:Clean;cv_GetSubRect:Clean;cv_HoughCircles:Clean;cv_HoughLines2:Clean;cv_InRangeS:Clean;cv_Laplace:Clean;cv_LoadImage:Clean;cv_LoadImage2:Clean;cv_LoadVideo:Clean;cv_MorphologyEx:Clean;cv_RandInt:Clean;cv_Resize:Clean;cv_SetImageROI:Clean;cv_SetImageROI2:Clean;cv_SetMouseCallback:Clean;cv_Smooth:Clean;cv_Sobel:Clean;cvSplit_cvMerge:Clean;cv_Save:Clean;cv_Sub:Clean;cvThreshold_cvAdaptiveThreshold:Clean;cv_Integral:Clean;cv_WarpPerspective:Clean;cv_MatchShapes:Clean;cv_WarpAffine:Clean;cv_SnakeImage:Clean;cv_CalcOpticalFlowPyrLK:Clean;HelloWorld:Clean;VideoProcessing:Clean;FaceDetect:Clean;Stereo:Clean;CameraCaptureAndFindContours:Clean;HandsDetect:Clean;Squares:Clean;CameraCalibrate:Clean;CameraShift:Clean;MoveDetect:Clean"/>
+        <CallTarget Targets="cv_AddWeighted:Clean;cvSetImageROI_cvAddWeighted:Clean;cv_And:Clean;cv_Canny:Clean;cv_CopyMakeBorder:Clean;cv_CreateCameraCapture:Clean;cv_CreateTrackbar:Clean;cv_CreateVideoWriter:Clean;cv_CvtColor:Clean;cv_CvtPixToPlane:Clean;cvErode_cvDilate:Clean;cv_FindContours:Clean;cv_FloodFill:Clean;cv_GetSubRect:Clean;cv_HoughCircles:Clean;cv_HoughLines2:Clean;cv_InRangeS:Clean;cv_Laplace:Clean;cv_LoadImage:Clean;cv_LoadImage2:Clean;cv_LoadVideo:Clean;cv_MorphologyEx:Clean;cv_RandInt:Clean;cv_Resize:Clean;cv_SetImageROI:Clean;cv_SetImageROI2:Clean;cv_SetMouseCallback:Clean;cv_Smooth:Clean;cv_Sobel:Clean;cvSplit_cvMerge:Clean;cv_Save:Clean;cv_Sub:Clean;cvThreshold_cvAdaptiveThreshold:Clean;cv_Integral:Clean;cv_WarpPerspective:Clean;cv_MatchShapes:Clean;cv_WarpAffine:Clean;cv_SnakeImage:Clean;cv_CalcOpticalFlowPyrLK:Clean;HelloWorld:Clean;VideoProcessing:Clean;FaceDetect:Clean;Stereo:Clean;CameraCaptureAndFindContours:Clean;HandsDetect:Clean;Squares:Clean;CameraCalibrate:Clean;CameraShift:Clean;minarea:Clean;fback_c:Clean;MoveDetect:Clean"/>
     </Target>
     <Target Name="Make">
-        <CallTarget Targets="cv_AddWeighted:Make;cvSetImageROI_cvAddWeighted:Make;cv_And:Make;cv_Canny:Make;cv_CopyMakeBorder:Make;cv_CreateCameraCapture:Make;cv_CreateTrackbar:Make;cv_CreateVideoWriter:Make;cv_CvtColor:Make;cv_CvtPixToPlane:Make;cvErode_cvDilate:Make;cv_FindContours:Make;cv_FloodFill:Make;cv_GetSubRect:Make;cv_HoughCircles:Make;cv_HoughLines2:Make;cv_InRangeS:Make;cv_Laplace:Make;cv_LoadImage:Make;cv_LoadImage2:Make;cv_LoadVideo:Make;cv_MorphologyEx:Make;cv_RandInt:Make;cv_Resize:Make;cv_SetImageROI:Make;cv_SetImageROI2:Make;cv_SetMouseCallback:Make;cv_Smooth:Make;cv_Sobel:Make;cvSplit_cvMerge:Make;cv_Save:Make;cv_Sub:Make;cvThreshold_cvAdaptiveThreshold:Make;cv_Integral:Make;cv_WarpPerspective:Make;cv_MatchShapes:Make;cv_WarpAffine:Make;cv_SnakeImage:Make;cv_CalcOpticalFlowPyrLK:Make;HelloWorld:Make;VideoProcessing:Make;FaceDetect:Make;Stereo:Make;CameraCaptureAndFindContours:Make;HandsDetect:Make;Squares:Make;CameraCalibrate:Make;CameraShift:Make;MoveDetect:Make"/>
+        <CallTarget Targets="cv_AddWeighted:Make;cvSetImageROI_cvAddWeighted:Make;cv_And:Make;cv_Canny:Make;cv_CopyMakeBorder:Make;cv_CreateCameraCapture:Make;cv_CreateTrackbar:Make;cv_CreateVideoWriter:Make;cv_CvtColor:Make;cv_CvtPixToPlane:Make;cvErode_cvDilate:Make;cv_FindContours:Make;cv_FloodFill:Make;cv_GetSubRect:Make;cv_HoughCircles:Make;cv_HoughLines2:Make;cv_InRangeS:Make;cv_Laplace:Make;cv_LoadImage:Make;cv_LoadImage2:Make;cv_LoadVideo:Make;cv_MorphologyEx:Make;cv_RandInt:Make;cv_Resize:Make;cv_SetImageROI:Make;cv_SetImageROI2:Make;cv_SetMouseCallback:Make;cv_Smooth:Make;cv_Sobel:Make;cvSplit_cvMerge:Make;cv_Save:Make;cv_Sub:Make;cvThreshold_cvAdaptiveThreshold:Make;cv_Integral:Make;cv_WarpPerspective:Make;cv_MatchShapes:Make;cv_WarpAffine:Make;cv_SnakeImage:Make;cv_CalcOpticalFlowPyrLK:Make;HelloWorld:Make;VideoProcessing:Make;FaceDetect:Make;Stereo:Make;CameraCaptureAndFindContours:Make;HandsDetect:Make;Squares:Make;CameraCalibrate:Make;CameraShift:Make;minarea:Make;fback_c:Make;MoveDetect:Make"/>
     </Target>
     <Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
 </Project>

samples/uses_include.inc

@@ -1,13 +0,0 @@
-uLibName in '..\..\..\include\uLibName.pas',
-highgui_c in '..\..\..\include\highgui\highgui_c.pas',
-core_c in '..\..\..\include\ñore\core_c.pas',
-Core.types_c in '..\..\..\include\ñore\Core.types_c.pas',
-imgproc.types_c in '..\..\..\include\imgproc\imgproc.types_c.pas',
-imgproc_c in '..\..\..\include\imgproc\imgproc_c.pas',
-legacy in '..\..\..\include\legacy\legacy.pas',
-calib3d in '..\..\..\include\calib3d\calib3d.pas',
-imgproc in '..\..\..\include\imgproc\imgproc.pas',
-haar in '..\..\..\include\objdetect\haar.pas',
-objdetect in '..\..\..\include\objdetect\objdetect.pas',
-tracking in '..\..\..\include\video\tracking.pas',
-Core in '..\..\..\include\ñore\core.pas'