Merge pull request #40 from BenediktS/rename-ocv.cvutils

rename ocv.cvutils to ocv.utils
2024-11-15 07:45:53 +01:00 · 2015-11-12 18:45:13 +03:00 · 2015-11-12 18:45:13 +03:00 · 53a9ca7547
commit 53a9ca7547
parent c306474e0c bf72069e6f
27 changed files with 27 additions and 27 deletions
--- a/samples/Components/cMatchTemplate/uMainForm.pas
+++ b/samples/Components/cMatchTemplate/uMainForm.pas
@ -63,7 +63,7 @@ implementation

 uses
  ocv.core_c,
-  ocv.core.types_c, ocv.cvutils;
+  ocv.core.types_c, ocv.utils;

 procedure TMainForm.btn1Click(Sender: TObject);
 begin
--- a/samples/Components/cObjectColorTracking/Unit1.pas
+++ b/samples/Components/cObjectColorTracking/Unit1.pas
@ -44,7 +44,7 @@ implementation
 Uses ocv.core.types_c,
  System.Math,
  ocv.core_c,
-  ocv.cvutils, ocv.imgproc_c, ocv.imgproc.types_c;
+  ocv.utils, ocv.imgproc_c, ocv.imgproc.types_c;

 procedure TForm1.frm22trckbr1Change(Sender: TObject);
 begin
--- a/samples/LearningOpenCV_Code/ch10_ex10_1.dpr
+++ b/samples/LearningOpenCV_Code/ch10_ex10_1.dpr
@ -57,7 +57,7 @@ program ch10_ex10_1;

 uses
  System.SysUtils,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c,
  ocv.highgui_c,
  ocv.core.types_c,
--- a/samples/LearningOpenCV_Code/ch10_ex10_2.dpr
+++ b/samples/LearningOpenCV_Code/ch10_ex10_2.dpr
@ -59,7 +59,7 @@ program ch10_ex10_2;

 uses
  System.SysUtils,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c,
  ocv.highgui_c,
  ocv.core.types_c,
--- a/samples/LearningOpenCV_Code/ch13_ex13_1.dpr
+++ b/samples/LearningOpenCV_Code/ch13_ex13_1.dpr
@ -62,7 +62,7 @@ program ch13_ex13_1;

 uses
  System.SysUtils,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c,
  ocv.highgui_c,
  ocv.core.types_c,
--- a/samples/LearningOpenCV_Code/ch9_watershed.dpr
+++ b/samples/LearningOpenCV_Code/ch9_watershed.dpr
@ -63,7 +63,7 @@ program ch9_watershed;

 uses
  System.SysUtils,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c,
  ocv.highgui_c,
  ocv.core.types_c,
--- a/samples/LibDemo/CvLatentSvmDetector/latentsvmdetect.dpr
+++ b/samples/LibDemo/CvLatentSvmDetector/latentsvmdetect.dpr
@ -35,7 +35,7 @@ uses
  ocv.imgproc_c,
  ocv.imgproc.types_c,
  ocv.objdetect_c,
-  ocv.cvutils,
+  ocv.utils,
  uResourcePaths;

 procedure help;
--- a/samples/LibDemo/cvCalcHist/cv_CalcHist2.dpr
+++ b/samples/LibDemo/cvCalcHist/cv_CalcHist2.dpr
@ -40,7 +40,7 @@ uses
  ocv.core.types_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.cvutils;
+  ocv.utils;

 Const
  CAMERA_INDEX = CV_CAP_ANY;
--- a/samples/LibDemo/cvDFT/cv_DFT.dpr
+++ b/samples/LibDemo/cvDFT/cv_DFT.dpr
@ -33,7 +33,7 @@ uses
  ocv.core.types_c,
  ocv.imgproc.types_c,
  ocv.imgproc_c,
-  ocv.cvutils;
+  ocv.utils;

 const
  CAMERA_INDEX = CV_CAP_ANY;
--- a/samples/LibDemo/cvMatchShapes/cv_MatchShapes2.dpr
+++ b/samples/LibDemo/cvMatchShapes/cv_MatchShapes2.dpr
@ -36,7 +36,7 @@ uses
  ocv.core.types_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.cvutils,
+  ocv.utils,
  uResourcePaths;

 // сравнение объектов по моментам их контуров
--- a/samples/LibDemo/cvSegmentImage/cv_SegmentImage.dpr
+++ b/samples/LibDemo/cvSegmentImage/cv_SegmentImage.dpr
@ -34,7 +34,7 @@ uses
  ocv.imgproc.types_c,
  ocv.imgproc_c,
  ocv.legacy,
-  ocv.cvutils;
+  ocv.utils;

 const
  CAMERA_INDEX = CV_CAP_ANY;
--- a/samples/MultiDemo/CameraShift/CameraShift.dpr
+++ b/samples/MultiDemo/CameraShift/CameraShift.dpr
@ -35,7 +35,7 @@ uses
  ocv.imgproc_c,
  ocv.imgproc.types_c,
  ocv.tracking_c,
-  ocv.cvutils;
+  ocv.utils;

 var
  image: pIplImage = nil;
--- a/samples/MultiDemo/FaceDetect/FaceDetect.dpr
+++ b/samples/MultiDemo/FaceDetect/FaceDetect.dpr
@ -41,7 +41,7 @@ uses
  ocv.objdetect_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.cvutils,
+  ocv.utils,
  uResourcePaths;

 Const
--- a/samples/MultiDemo/FaceDetectAndLockWorkstation/uMainForm.pas
+++ b/samples/MultiDemo/FaceDetectAndLockWorkstation/uMainForm.pas
@ -5,7 +5,7 @@ unit uMainForm;
 interface

 uses
-  ocv.core.types_c, ocv.core_c, ocv.highgui_c, ocv.objdetect_c, ocv.cvutils,
+  ocv.core.types_c, ocv.core_c, ocv.highgui_c, ocv.objdetect_c, ocv.utils,
  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ExtCtrls, Vcl.StdCtrls, Vcl.Samples.Spin,
  Vcl.Menus, Vcl.ImgList, uResourcePaths;
--- a/samples/MultiDemo/ObjectTracking/ObjectTrack.dpr
+++ b/samples/MultiDemo/ObjectTracking/ObjectTrack.dpr
@ -38,7 +38,7 @@ uses
  ocv.imgproc_c,
  ocv.imgproc.types_c,
  ocv.core.types_c,
-  ocv.cvutils;
+  ocv.utils;

 // default capture width and height
 const
--- a/samples/MultiDemo/art/art.dpr
+++ b/samples/MultiDemo/art/art.dpr
@ -6,7 +6,7 @@ program art;
 uses
  System.SysUtils,
  System.Math,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c,
  ocv.highgui_c,
  ocv.core.types_c,
--- a/samples/VCLDemo/vclCameraCapture/uMainForm.pas
+++ b/samples/VCLDemo/vclCameraCapture/uMainForm.pas
@ -79,7 +79,7 @@ implementation

 {$R *.dfm}

-uses ocv.core.types_c, ocv.cvutils;
+uses ocv.core.types_c, ocv.utils;

 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
--- a/samples/VCLDemo/vclChessboardCorners/MainForm.pas
+++ b/samples/VCLDemo/vclChessboardCorners/MainForm.pas
@ -74,7 +74,7 @@ implementation

 uses
  ocv.core_c,
-  ocv.cvutils,
+  ocv.utils,
  ocv.calib3d_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c;
--- a/samples/VCLDemo/vclColorTracking/uMainForm.pas
+++ b/samples/VCLDemo/vclColorTracking/uMainForm.pas
@ -86,7 +86,7 @@ Uses
  ocv.core_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.cvutils;
+  ocv.utils;

 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
--- a/samples/VCLDemo/vclColorTracking2/uMainForm.pas
+++ b/samples/VCLDemo/vclColorTracking2/uMainForm.pas
@ -108,7 +108,7 @@ Uses
  ocv.core_c,
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.cvutils;
+  ocv.utils;

 const
  FRAME_WIDTH = 640;
--- a/samples/VCLDemo/vclIPCameraCapture/uMainForm.pas
+++ b/samples/VCLDemo/vclIPCameraCapture/uMainForm.pas
@ -82,7 +82,7 @@ implementation

 {$R *.dfm}

-uses ocv.core.types_c, ocv.cvutils;
+uses ocv.core.types_c, ocv.utils;

 procedure TMainForm.ButtonStartCaptureClick(Sender: TObject);
 var
--- a/samples/VCLDemo/vclPCArecognition/uMainForm.pas
+++ b/samples/VCLDemo/vclPCArecognition/uMainForm.pas
@ -83,7 +83,7 @@ uses
  ocv.highgui_c,
  ocv.core.types_c,
  ocv.legacy,
-  ocv.cvutils;
+  ocv.utils;

 procedure TMainForm.btn1Click(Sender: TObject);
 const
--- a/source/component/ocv.comp.ImageOperation.pas
+++ b/source/component/ocv.comp.ImageOperation.pas
@ -1024,7 +1024,7 @@ implementation
 uses
  ocv.core_c,
  ocv.imgproc_c,
-  ocv.cvutils,
+  ocv.utils,
 {$IFDEF HAS_UNITSCOPE}
  System.Math;
 {$ELSE}
--- a/source/component/ocv.comp.Proc.pas
+++ b/source/component/ocv.comp.Proc.pas
@ -41,7 +41,7 @@ Uses
 {$ENDIF}
  ocv.core_c,
  ocv.imgproc_c,
-  ocv.cvutils;
+  ocv.utils;

 {$I Opencv.inc}

--- a/source/component/ocv.comp.Types.pas
+++ b/source/component/ocv.comp.Types.pas
@ -388,7 +388,7 @@ implementation
 uses
  ocv.imgproc_c,
  ocv.imgproc.types_c,
-  ocv.highgui_c, ocv.cvutils;
+  ocv.highgui_c, ocv.utils;

 function ocvPixel(const R, G, B: byte): TocvPixel;
 begin
--- a/source/component/ocv.comp.View.pas
+++ b/source/component/ocv.comp.View.pas
@ -161,7 +161,7 @@ type
 implementation

 uses
-  ocv.cvutils;
+  ocv.utils;

 { TOpenCVView }

--- a/source/ocv.highgui.pas
+++ b/source/ocv.highgui.pas
@ -135,7 +135,7 @@ implementation

 uses
  ocv.lib,
-  ocv.cvutils,
+  ocv.utils,
  ocv.core_c;

 function CreateVideoCapture: TccvVideoCapture; stdcall; external opencv_classes_lib name 'CreateVideoCapture'; overload;