Small fix

Author: Laex

packages/CVClass.pas

@@ -36,7 +36,6 @@ interface
   System.SyncObjs,
   VCL.Controls,
   VCL.Graphics,
-  VCL.Themes,
   VCL.Direct2D,
   D2D1,
   cpp.utils,
@@ -472,7 +471,7 @@ implementation
 
 uses
   System.UITypes,
-  WinApi.DxgiFormat,
+
   cv.utils;
 
 var

packages/Delphi 12.0 Athens/dclCVClass.dpk

@@ -39,6 +39,10 @@ requires
 contains
   CVClass in '..\CVClass.pas',
   CVProp in '..\CVProp.pas',
-  CVRegVCL in '..\CVRegVCL.pas';
+  CVRegVCL in '..\CVRegVCL.pas',
+  cpp.utils in '..\..\source\cpp.utils.pas',
+  cv.external in '..\..\source\cv.external.pas',
+  cv.opencv in '..\..\source\cv.opencv.pas',
+  cv.utils in '..\..\source\cv.utils.pas';
 
 end.

packages/Delphi 12.0 Athens/dclCVClass.dproj

@@ -84,6 +84,7 @@
         <DCC_UnitSearchPath>..\..\source\;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
         <DCC_Define>PACKAGE;$(DCC_Define)</DCC_Define>
         <DCC_OutputXMLDocumentation>true</DCC_OutputXMLDocumentation>
+        <DCC_NO_RETVAL>false</DCC_NO_RETVAL>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
@@ -145,6 +146,10 @@
         <DCCReference Include="..\CVClass.pas"/>
         <DCCReference Include="..\CVProp.pas"/>
         <DCCReference Include="..\CVRegVCL.pas"/>
+        <DCCReference Include="..\..\source\cpp.utils.pas"/>
+        <DCCReference Include="..\..\source\cv.external.pas"/>
+        <DCCReference Include="..\..\source\cv.opencv.pas"/>
+        <DCCReference Include="..\..\source\cv.utils.pas"/>
         <RcItem Include="..\resource\DCV32x32.bmp">
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>DOCVSPLASH</ResourceId>

packages/Delphi 12.0 Athens/dclCVClass.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <namespace name=".dclCVClass" platform="Win32">
-  <contains name="cv.external" />
   <contains name="cv.utils" />
-  <contains name="cpp.utils" />
   <contains name="cv.opencv" />
+  <contains name="cv.external" />
+  <contains name="cpp.utils" />
   <contains name="CVRegVCL" />
   <contains name="CVProp" />
   <contains name="CVClass" />

source/core/check.impl.inc

@@ -27,8 +27,6 @@ function depthToString(depth: int): pCVChar;
 begin
 {$IF not defined(PACKAGE)}
   Result := func_depthToString(depth);
-//{$ELSE}
-//  Result := nil;
 {$IFEND}
 end;
 

source/imgproc.inc

@@ -2859,7 +2859,7 @@ function morphologyDefaultBorderValue(): TScalar; {$IFDEF USE_INLINE}inline; {$E
 function getAffineTransform(const src,dst:TArray<TPoint2f>):TMat; overload; {$IFDEF USE_INLINE}inline; {$ENDIF}
 Type
   TAffineTransformPoints = array[0..2] of TPoint2f;
-  pPoint2f = TPoint2f;
+  pPoint2f = ^TPoint2f;
 function getAffineTransform(const src,dst:TAffineTransformPoints):TMat; overload; {$IFDEF USE_INLINE}inline; {$ENDIF}
 function getAffineTransform(const src,dst:pPoint2f):TMat; overload; {$IFDEF USE_INLINE}inline; {$ENDIF}