OpenCV 4.6.0

Signed-off-by: Laentir Valetov <[email protected]>

Author: Laex

.gitignore

@@ -34,6 +34,8 @@ Test/
 *.dll
 !opencv_delphi455.dll
 !opencv_delphi455d.dll
+!opencv_delphi460.dll
+!opencv_delphi460d.dll
 *.bpl
 *.bpi
 *.dcp

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021, Laentir Valetov, [email protected]
+   Copyright 2021-2022, Laentir Valetov, [email protected]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,5 +1,5 @@
 # Delphi binding for OpenCV
-* Experimental Delphi binding for OpenCV 4.5.5
+* Experimental Delphi binding for OpenCV 4.6.0
 * Development environment - Delphi 10.4, 11
 * x64 platform only
 
@@ -8,17 +8,17 @@
 + Laentir Valetov (email: [email protected])
 ## Usage:
 1. Download the current state of the project as [zip][1] or as [git][2]
-2. Download [OpenCV 4.5.4][3], run and unpack to the selected directory.<br>
+2. Download [OpenCV 4.6.0][3], run and unpack to the selected directory.<br>
 The following DLLs are required to work properly<br>
 __From `<opencv>\build\x64\vc15\bin\`__
-* opencv_videoio_ffmpeg455_64.dll - `release`<br>
-* opencv_videoio_msmf455_64.dll   - `release`<br>
-* opencv_world455.dll             - `release`<br>
-* opencv_videoio_msmf455_64d.dll  - `debug`<br>
-* opencv_world455d.dll            - `debug`<br>
+* opencv_videoio_ffmpeg460_64.dll - `release`<br>
+* opencv_videoio_msmf460_64.dll   - `release`<br>
+* opencv_world460.dll             - `release`<br>
+* opencv_videoio_msmf460_64d.dll  - `debug`<br>
+* opencv_world460d.dll            - `debug`<br>
 **From `<project>\bin\`**
-* opencv_delphi455.dll - `release`<br>
-* opencv_delphi455d.dll - `debug`<br>
+* opencv_delphi460.dll - `release`<br>
+* opencv_delphi460d.dll - `debug`<br>
 
 __For the library to work properly, you need__
 - place next to the executable file of your program. To run examples - in `<project>\bin\`<br>
@@ -45,4 +45,4 @@ __For the library to work properly, you need__
 
 [1]: https://github.com/Laex/Delphi-OpenCV-Class/archive/refs/heads/main.zip
 [2]: https://github.com/Laex/Delphi-OpenCV-Class.git
-[3]: https://github.com/opencv/opencv/releases/download/4.5.4/opencv-4.5.4-vc14_vc15.exe
+[3]: https://github.com/opencv/opencv/releases/download/4.6.0/opencv-4.6.0-vc14_vc15.exe

bin/opencv_delphi460.dll

@@ -75,7 +75,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <TargetName>$(ProjectName)455d</TargetName>
+    <TargetName>$(ProjectName)460d</TargetName>
     <IncludePath>C:\OpenCV\opencv\build\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(ProjectName)455</TargetName>
+    <TargetName>$(ProjectName)460</TargetName>
     <IncludePath>C:\OpenCV\opencv\build\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
@@ -119,7 +119,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>C:\OpenCV\opencv\build\x64\vc15\lib\opencv_world455d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\OpenCV\opencv\build\x64\vc15\lib\opencv_world460d.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -161,7 +161,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>C:\OpenCV\opencv\build\x64\vc15\lib\opencv_world455.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\OpenCV\opencv\build\x64\vc15\lib\opencv_world460.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

bin/opencv_delphi460d.dll

@@ -37,13 +37,13 @@ implementation
   ToolsAPI,
   CVClass;
 
-{$i '../../source/core/version.inc'}
+{$I '..\..\source\core\version.inc'}
 
 const
   PackageText = 'Delphi binding for OpenCV';
 
 resourcestring
-  resPackageName = PackageText+' '+CV_VERSION;
+  resPackageName = PackageText + ' ' + CV_VERSION;
   resAboutDescription = PackageText;
   resAboutURL = 'https://github.com/Laex/Delphi-OpenCV-Class/';
   resAboutCopyright = 'Copyright (c) 2021 Laentir Valetov';
@@ -54,13 +54,13 @@ implementation
 
 procedure Register;
 begin
-  RegisterComponents('OpenCV', [TCVView, TCVCaptureSource,TCVVideoWriter]);
+  RegisterComponents('OpenCV', [TCVView, TCVCaptureSource, TCVVideoWriter]);
   RegisterClasses([TCVWebCameraSource, TCVFileSource]);
 end;
 
 var
   AboutBoxServices: IOTAAboutBoxServices = nil;
-  AboutBoxIndex: Integer = 0;
+  AboutBoxIndex: Integer                 = 0;
 
 procedure RegisterAboutBox;
 var