diff --git a/samples/Components/cMatchTemplate/uMainForm.pas b/samples/Components/cMatchTemplate/uMainForm.pas index 537d8c2..c73e6e7 100644 --- 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 diff --git a/samples/Components/cObjectColorTracking/Unit1.pas b/samples/Components/cObjectColorTracking/Unit1.pas index 3aa8017..24f930f 100644 --- 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 diff --git a/samples/LearningOpenCV_Code/ch10_ex10_1.dpr b/samples/LearningOpenCV_Code/ch10_ex10_1.dpr index 5fa4647..d62c24c 100644 --- 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, diff --git a/samples/LearningOpenCV_Code/ch10_ex10_1.dproj b/samples/LearningOpenCV_Code/ch10_ex10_1.dproj index 2b947b6..163b114 100644 --- a/samples/LearningOpenCV_Code/ch10_ex10_1.dproj +++ b/samples/LearningOpenCV_Code/ch10_ex10_1.dproj @@ -1,7 +1,7 @@  {1D57A361-9E04-4E9E-A36C-F356EA4E7D57} - 17.2 + 18.0 None ch10_ex10_1.dpr True @@ -65,6 +65,8 @@ true + $(BDS)\bin\delphi_PROJECTICNS.icns + $(BDS)\bin\delphi_PROJECTICON.ico CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= 1049 None @@ -163,7 +165,412 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + + + + true + + + + + true + + + + + true + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + Contents\MacOS + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + library\lib\mips + 1 + + + + + 0 + + + 1 + + + Contents\MacOS + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + Contents\MacOS + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + library\lib\x86 + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + Contents\MacOS + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + ../ + 1 + + + ../ + 1 + + + + + res\drawable-hdpi + 1 + + + + + library\lib\armeabi-v7a + 1 + + + + + Contents + 1 + + + + + ../ + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 1 + + + 1 + + + + + + + + + + False False diff --git a/samples/LearningOpenCV_Code/ch10_ex10_1.res b/samples/LearningOpenCV_Code/ch10_ex10_1.res index 7435995..6876088 100644 Binary files a/samples/LearningOpenCV_Code/ch10_ex10_1.res and b/samples/LearningOpenCV_Code/ch10_ex10_1.res differ diff --git a/samples/LearningOpenCV_Code/ch10_ex10_2.dpr b/samples/LearningOpenCV_Code/ch10_ex10_2.dpr index bde3d34..545a800 100644 --- 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, diff --git a/samples/LearningOpenCV_Code/ch10_ex10_2.dproj b/samples/LearningOpenCV_Code/ch10_ex10_2.dproj index 896fbf9..a905f9c 100644 --- a/samples/LearningOpenCV_Code/ch10_ex10_2.dproj +++ b/samples/LearningOpenCV_Code/ch10_ex10_2.dproj @@ -7,12 +7,27 @@ 1025 Console None - 17.2 + 18.0 Win32 true + + true + Base + true + + + true + Base + true + + + true + Base + true + true Base @@ -28,6 +43,24 @@ Base true + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + true Cfg_2 @@ -35,6 +68,8 @@ true + $(BDS)\bin\delphi_PROJECTICNS.icns + $(BDS)\bin\delphi_PROJECTICON.ico None .\$(Platform)\$(Config) ..\..\bin\$(Platform) @@ -49,6 +84,66 @@ ch10_ex10_2 false + + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + $(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png + true + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png + $(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png + true + Debug + 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= + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png + + + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(MSBuildProjectName) + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + true + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + Debug + + + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + true + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + 1033 Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) @@ -65,6 +160,15 @@ false true + + true + + + Debug + + + true + 1033 None @@ -99,7 +203,10 @@ + False + False True + False False True False @@ -110,11 +217,3 @@ - - diff --git a/samples/LearningOpenCV_Code/ch10_ex10_2.res b/samples/LearningOpenCV_Code/ch10_ex10_2.res index e91f415..24ae910 100644 Binary files a/samples/LearningOpenCV_Code/ch10_ex10_2.res and b/samples/LearningOpenCV_Code/ch10_ex10_2.res differ diff --git a/samples/LearningOpenCV_Code/ch13_ex13_1.dpr b/samples/LearningOpenCV_Code/ch13_ex13_1.dpr index 479d156..fa023a9 100644 --- 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, diff --git a/samples/LearningOpenCV_Code/ch13_ex13_1.dproj b/samples/LearningOpenCV_Code/ch13_ex13_1.dproj index 78d85a5..bea838b 100644 --- a/samples/LearningOpenCV_Code/ch13_ex13_1.dproj +++ b/samples/LearningOpenCV_Code/ch13_ex13_1.dproj @@ -1,7 +1,7 @@  {FD54BCD5-7861-41CA-AEE8-B45FE852906A} - 17.2 + 18.0 None ch13_ex13_1.dpr True @@ -18,6 +18,16 @@ Base true + + true + Base + true + + + true + Base + true + true Base @@ -38,16 +48,6 @@ Base true - - true - Base - true - - - true - Base - true - true Base @@ -65,6 +65,8 @@ true + $(BDS)\bin\delphi_PROJECTICNS.icns + $(BDS)\bin\delphi_PROJECTICON.ico ch13_ex13_1 System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) 1049 @@ -91,6 +93,28 @@ $(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png $(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png + + true + $(MSBuildProjectName) + DBXInterBaseDriver;DataSnapCommon;DbxCommonDriver;dbxcds;CustomIPTransport;dsnap;IndyIPServer;IndyCore;CloudService;FmxTeeUI;FireDACIBDriver;dsnapxml;bindcompfmx;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;xmlrtl;ibxpress;FireDACCommonDriver;bindengine;soaprtl;FMXTee;inet;soapmidas;RESTComponents;dbexpress;IndyIPClient;FireDACSqliteDriver;FireDACDSDriver;DBXSqliteDriver;fmx;IndySystem;tethering;DataSnapClient;DataSnapProviderClient;fmxFireDAC;fmxase;IndyIPCommon;DataSnapFireDAC;FireDACDBXDriver;soapserver;emsclientfiredac;rtl;DbxClientDriver;DataSnapNativeClient;IndyProtocols;bindcompdbx;emsclient;FireDAC;$(DCC_UsePackage);$(DCC_UsePackage) + Base + iPhoneAndiPad + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false + true + true + Debug + + + true + $(MSBuildProjectName) + DBXInterBaseDriver;DataSnapCommon;DbxCommonDriver;dbxcds;CustomIPTransport;dsnap;IndyIPServer;IndyCore;CloudService;FmxTeeUI;FireDACIBDriver;dsnapxml;bindcompfmx;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;xmlrtl;ibxpress;FireDACCommonDriver;bindengine;soaprtl;FMXTee;inet;soapmidas;RESTComponents;dbexpress;IndyIPClient;FireDACSqliteDriver;FireDACDSDriver;DBXSqliteDriver;fmx;IndySystem;tethering;DataSnapClient;DataSnapProviderClient;fmxFireDAC;fmxase;IndyIPCommon;DataSnapFireDAC;FireDACDBXDriver;soapserver;emsclientfiredac;rtl;DbxClientDriver;DataSnapNativeClient;IndyProtocols;bindcompdbx;emsclient;FireDAC;$(DCC_UsePackage);$(DCC_UsePackage) + Base + iPhoneAndiPad + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false + true + true + Debug + DBXInterBaseDriver;DataSnapCommon;DbxCommonDriver;dbxcds;CustomIPTransport;dsnap;IndyIPServer;IndyCore;CloudService;FmxTeeUI;FireDACIBDriver;dsnapxml;bindcompfmx;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;xmlrtl;ibxpress;FireDACCommonDriver;bindengine;soaprtl;FMXTee;inet;soapmidas;RESTComponents;dbexpress;IndyIPClient;FireDACSqliteDriver;FireDACDSDriver;DBXSqliteDriver;fmx;IndySystem;tethering;DataSnapClient;DataSnapProviderClient;fmxFireDAC;fmxase;IndyIPCommon;DataSnapFireDAC;FireDACDBXDriver;soapserver;emsclientfiredac;rtl;DbxClientDriver;DataSnapNativeClient;IndyProtocols;bindcompdbx;emsclient;FireDAC;$(DCC_UsePackage) @@ -109,28 +133,6 @@ true cxSchedulerTreeBrowserRS20;cxGridRS20;dxFireDACServerModeRS20;NxGridRun_dxe7;dxPScxExtCommonRS20;dxPSdxLCLnkRS20;dxSkinOffice2007SilverRS20;cxPageControlRS20;dxPSdxSpreadSheetLnkRS20;FireDACPgDriver;DBXInterBaseDriver;DataSnapServer;DataSnapCommon;dxSkinsdxBarPainterRS20;dxSkinSharpRS20;DbxCommonDriver;dxLayoutControlRS20;vclimg;dxSkinSilverRS20;NxDBGridRun_dxe7;dbxcds;dxSkinsdxNavBarPainterRS20;DatasnapConnectorsFreePascal;NxCommonDsgn_dxe7;dxPSCoreRS20;dxSkinOffice2013LightGrayRS20;vcldb;NxSheetRun_dxe7;dxPSTeeChartRS20;dxSkinOffice2013WhiteRS20;dxSkinMcSkinRS20;CustomIPTransport;NxCollectionDsgn_dxe7;dsnap;IndyIPServer;dxSkinCoffeeRS20;dxSkinGlassOceansRS20;IndyCore;dxSkinOffice2010SilverRS20;dxComnRS20;CloudService;dxFlowChartRS20;dxSkinOffice2013DarkGrayRS20;FmxTeeUI;FireDACIBDriver;dxDBXServerModeRS20;cxTreeListdxBarPopupMenuRS20;dxSkinOffice2007PinkRS20;dxSkinSpringTimeRS20;IcsFmxDXE7Run;dxPsPrVwAdvRS20;dxPScxGridLnkRS20;dxSkiniMaginaryRS20;dxSkinDevExpressDarkStyleRS20;tmsdXE7;cxSchedulerGridRS20;dxtrmdRS20;dsnapxml;FireDACDb2Driver;NxDBGridDsgn_dxe7;dxSpreadSheetRS20;dxSkinMoneyTwinsRS20;dxSkinOffice2007GreenRS20;dxPScxTLLnkRS20;IcsCommonDXE7Run;cxPivotGridOLAPRS20;dxPSdxFCLnkRS20;bindcompfmx;FireDACODBCDriver;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;inetdb;DBXOdbcDriver;vclFireDAC;xmlrtl;cxSpreadSheetRS20;ibxpress;dxSkinOffice2007BlackRS20;dxPScxSSLnkRS20;FireDACCommonDriver;bindengine;vclactnband;soaprtl;FMXTee;dxGDIPlusRS20;bindcompvcl;vclie;cxVerticalGridRS20;cxSchedulerRS20;dxSkinBlackRS20;FireDACMSSQLDriver;DBXInformixDriver;dxSkinSummer2008RS20;Intraweb;cxBarEditItemRS20;DataSnapServerMidas;dsnapcon;DBXFirebirdDriver;tmsexdXE7;inet;dxBarRS20;cxDataRS20;dxSkinDarkSideRS20;FireDACMySQLDriver;soapmidas;vclx;dxPScxVGridLnkRS20;dxSkinLondonLiquidSkyRS20;dxCoreRS20;DBXSybaseASADriver;RESTComponents;dxPSPrVwRibbonRS20;dbexpress;dxPSLnksRS20;IndyIPClient;dxSpellCheckerRS20;dxBarExtItemsRS20;office2K;dxdbtrRS20;FireDACSqliteDriver;FireDACDSDriver;cxSchedulerRibbonStyleEventEditorRS20;DBXSqliteDriver;ZComponent;fmx;dxSkinVS2010RS20;IndySystem;TeeDB;tethering;dxPScxPCProdRS20;dxSkinXmas2008BlueRS20;vclib;dxTabbedMDIRS20;DataSnapClient;dxmdsRS20;DataSnapProviderClient;DBXSybaseASEDriver;dxdborRS20;dxPSdxDBTVLnkRS20;MetropolisUILiveTile;dxPScxSchedulerLnkRS20;dxSkinCaramelRS20;dxSkinLiquidSkyRS20;vcldsnap;dxGaugeControlRS20;dxSkinDevExpressStyleRS20;fmxFireDAC;cxPivotGridChartRS20;DBXDb2Driver;DBXOracleDriver;dxSkinOffice2010BlueRS20;dcldxSkinsCoreRS20;vclribbon;cxExportRS20;dxServerModeRS20;dxSkinscxSchedulerPainterRS20;dxSkinMetropolisDarkRS20;fmxase;vcl;DBXMSSQLDriver;IndyIPCommon;dxSkinBlueRS20;dxSkinsdxDLPainterRS20;DataSnapFireDAC;FireDACDBXDriver;dxBarExtDBItemsRS20;soapserver;dxPSDBTeeChartRS20;dxSkinOffice2010BlackRS20;IcsVclDXE7Run;inetdbxpress;dxADOServerModeRS20;dxSkinBlueprintRS20;dxSkinFoggyRS20;dxSkinSharpPlusRS20;FireDACInfxDriver;cxPivotGridRS20;adortl;dxRibbonRS20;FireDACASADriver;dxSkinHighContrastRS20;dxSkinTheAsphaltWorldRS20;NxInspectorRun_dxe7;dxBarDBNavRS20;dxSkinscxPCPainterRS20;ZDbc;emsclientfiredac;rtl;DbxClientDriver;dxNavBarRS20;dxSkinMetropolisRS20;ZPlain;dxDockingRS20;Tee;dxSkinOffice2007BlueRS20;dxSkinsdxRibbonPainterRS20;dxSkinValentineRS20;DataSnapNativeClient;IndyProtocols;DBXMySQLDriver;dxPScxCommonRS20;dxSkinSevenClassicRS20;dxSkinPumpkinRS20;bindcompdbx;TeeUI;NxCommonRun_dxe7;dxSkinDarkRoomRS20;FireDACADSDriver;vcltouch;NxInspectorDsgn_dxe7;dxSkinStardustRS20;cxEditorsRS20;ZCore;emsclient;dxorgcRS20;dxPSdxDBOCLnkRS20;VCLRESTComponents;FireDAC;VclSmp;NxGridDsgn_dxe7;dxSkinsCoreRS20;DataSnapConnectors;dxSkinSevenRS20;cxLibraryRS20;fmxobj;NxCollectionRun_dxe7;OpenCV210;dxMapControlRS20;ZParseSql;dxWizardControlRS20;dxSkinLilianRS20;FireDACOracleDriver;fmxdae;dxPScxPivotGridLnkRS20;dxSkinWhiteprintRS20;dxPSdxOCLnkRS20;dxThemeRS20;FireDACMSAccDriver;DataSnapIndy10ServerTransport;cxTreeListRS20;dxTileControlRS20;$(DCC_UsePackage) - - true - $(MSBuildProjectName) - DBXInterBaseDriver;DataSnapCommon;DbxCommonDriver;dbxcds;CustomIPTransport;dsnap;IndyIPServer;IndyCore;CloudService;FmxTeeUI;FireDACIBDriver;dsnapxml;bindcompfmx;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;xmlrtl;ibxpress;FireDACCommonDriver;bindengine;soaprtl;FMXTee;inet;soapmidas;RESTComponents;dbexpress;IndyIPClient;FireDACSqliteDriver;FireDACDSDriver;DBXSqliteDriver;fmx;IndySystem;tethering;DataSnapClient;DataSnapProviderClient;fmxFireDAC;fmxase;IndyIPCommon;DataSnapFireDAC;FireDACDBXDriver;soapserver;emsclientfiredac;rtl;DbxClientDriver;DataSnapNativeClient;IndyProtocols;bindcompdbx;emsclient;FireDAC;$(DCC_UsePackage);$(DCC_UsePackage) - Base - iPhoneAndiPad - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false - true - true - Debug - - - true - $(MSBuildProjectName) - DBXInterBaseDriver;DataSnapCommon;DbxCommonDriver;dbxcds;CustomIPTransport;dsnap;IndyIPServer;IndyCore;CloudService;FmxTeeUI;FireDACIBDriver;dsnapxml;bindcompfmx;RESTBackendComponents;dbrtl;FireDACCommon;bindcomp;xmlrtl;ibxpress;FireDACCommonDriver;bindengine;soaprtl;FMXTee;inet;soapmidas;RESTComponents;dbexpress;IndyIPClient;FireDACSqliteDriver;FireDACDSDriver;DBXSqliteDriver;fmx;IndySystem;tethering;DataSnapClient;DataSnapProviderClient;fmxFireDAC;fmxase;IndyIPCommon;DataSnapFireDAC;FireDACDBXDriver;soapserver;emsclientfiredac;rtl;DbxClientDriver;DataSnapNativeClient;IndyProtocols;bindcompdbx;emsclient;FireDAC;$(DCC_UsePackage);$(DCC_UsePackage) - Base - iPhoneAndiPad - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false - true - true - Debug - DEBUG;$(DCC_Define) true @@ -178,7 +180,7 @@ Microsoft Office XP Sample Automation Server Wrapper Components - + ch13_ex13_1.exe @@ -190,79 +192,123 @@ true - - - true - - - true - - true - + + + true + + + + + true + + + 1 - .dylib + + 1 + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + Contents\MacOS 0 - .bpl + + + 1 Contents\MacOS 1 - .dylib + + + + library\lib\mips + 1 + + + 1 - .dylib + + + 1 1 - .dylib - - - 1 - .dylib - + 0 - .dll;.bpl + + + 1 Contents\MacOS 1 - .dylib - - - 1 - .dylib 1 - .dylib + + + library\lib\armeabi-v7a + 1 + + + 1 - + + + 0 + + + Contents\MacOS + 1 + .framework + + + + + 1 + 1 - - 1 - 1 - - - Contents + + + library\lib\x86 1 @@ -276,121 +322,97 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + Contents\MacOS + 1 + + + + + 1 + + + 1 + + + 1 + + res\drawable-normal 1 - - - library\lib\x86 - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ../ - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xlarge - 1 - - res\drawable-xhdpi 1 - + + + res\drawable-large + 1 + + + + + 1 + 1 - - 1 - 1 - - - res\drawable-xxhdpi - 1 - - - - - library\lib\mips - 1 - - - - - res\drawable - 1 - - - - - Contents\MacOS - 1 - - - 1 - - - 0 - - - - - Contents\MacOS - 1 - .framework - - - 0 - - - - - res\drawable-small - 1 - - ../ @@ -401,172 +423,11 @@ 1 - - - Contents\MacOS - 1 - - - 1 - - - Contents\MacOS - 0 - - - - - classes - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable - 1 - - - - - Contents\Resources - 1 - - - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - + library\lib\armeabi-v7a 1 - - 1 - - - 0 - - - Contents\MacOS - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi - 1 - - - - - res\drawable-large - 1 - - - - - 0 - - - 0 - - - 0 - - - Contents\MacOS - 0 - - - 0 - - - 0 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-ldpi - 1 - - - - - res\values - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-mdpi - 1 - @@ -574,18 +435,167 @@ 1 + + + Contents + 1 + + + + + ../ + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + 1 - - - + + + res\drawable + 1 + + + + + 0 + + + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + - - + + + + + False @@ -603,11 +613,3 @@ - - diff --git a/samples/LearningOpenCV_Code/ch13_ex13_1.res b/samples/LearningOpenCV_Code/ch13_ex13_1.res index 7435995..6876088 100644 Binary files a/samples/LearningOpenCV_Code/ch13_ex13_1.res and b/samples/LearningOpenCV_Code/ch13_ex13_1.res differ diff --git a/samples/LearningOpenCV_Code/ch9_watershed.dpr b/samples/LearningOpenCV_Code/ch9_watershed.dpr index f186a43..8fc4aea 100644 --- 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, diff --git a/samples/LearningOpenCV_Code/ch9_watershed.dproj b/samples/LearningOpenCV_Code/ch9_watershed.dproj index ec92b79..486accf 100644 --- a/samples/LearningOpenCV_Code/ch9_watershed.dproj +++ b/samples/LearningOpenCV_Code/ch9_watershed.dproj @@ -7,12 +7,27 @@ 1025 Console None - 17.2 + 18.0 Win32 true + + true + Base + true + + + true + Base + true + + + true + Base + true + true Base @@ -28,6 +43,24 @@ Base true + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + true Cfg_2 @@ -35,6 +68,8 @@ true + $(BDS)\bin\delphi_PROJECTICNS.icns + $(BDS)\bin\delphi_PROJECTICON.ico None .\$(Platform)\$(Config) ..\..\bin\$(Platform) @@ -49,6 +84,66 @@ ch9_watershed false + + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + $(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png + true + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png + $(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png + true + Debug + 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= + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png + + + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(MSBuildProjectName) + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + true + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + Debug + + + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + true + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + 1033 Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) @@ -65,6 +160,15 @@ false true + + true + + + Debug + + + true + 1033 None @@ -99,72 +203,133 @@ + False + False True + False False True False - + true + + + true + + ch9_watershed.exe true - + true - - - 1 - .dylib + + + true + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + Contents\MacOS 0 - .bpl 1 - .dylib + + + + library\lib\mips + 1 + + + 1 - .dylib - - 1 - .dylib - - - - - 1 - .dylib - - - 0 - .dll;.bpl - - - 1 - - 1 - 1 - + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF @@ -175,256 +340,90 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + res\drawable-normal 1 - - - library\lib\x86 - 1 - - - - - 1 - - - 1 - - - 1 - - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xlarge - 1 - - res\drawable-xhdpi 1 - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xxhdpi - 1 - - - - - library\lib\mips - 1 - - - - - res\drawable - 1 - - - - - 1 - - - 1 - - - 0 - - - - - 1 - .framework - - - 0 - - - - - res\drawable-small - 1 - - - - - - 1 - - - Contents\MacOS - 0 - - - - - classes - 1 - - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable - 1 - - - - - Contents\Resources - 1 - - - - - - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi-v7a - 1 - - - 1 - - - 0 - - - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi - 1 - - res\drawable-large 1 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - + 1 - + 1 1 - + + - res\drawable-ldpi - 1 - - - - - res\values - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-mdpi + library\lib\armeabi-v7a 1 @@ -434,18 +433,142 @@ 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + 1 - - - + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + - + + + + 12 @@ -454,11 +577,3 @@ - - diff --git a/samples/LearningOpenCV_Code/ch9_watershed.res b/samples/LearningOpenCV_Code/ch9_watershed.res index e91f415..24ae910 100644 Binary files a/samples/LearningOpenCV_Code/ch9_watershed.res and b/samples/LearningOpenCV_Code/ch9_watershed.res differ diff --git a/samples/LibDemo/CvLatentSvmDetector/latentsvmdetect.dpr b/samples/LibDemo/CvLatentSvmDetector/latentsvmdetect.dpr index b4269a1..dffd2cf 100644 --- 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; diff --git a/samples/LibDemo/cvCalcHist/cv_CalcHist2.dpr b/samples/LibDemo/cvCalcHist/cv_CalcHist2.dpr index 10e67af..976762c 100644 --- 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; diff --git a/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.dproj b/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.dproj index dd25298..76ea1f2 100644 --- a/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.dproj +++ b/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.dproj @@ -7,12 +7,32 @@ 3 Console None - 17.2 + 18.0 Win32 true + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + true Base @@ -33,6 +53,24 @@ Base true + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + true Cfg_2 @@ -40,6 +78,8 @@ true + $(BDS)\bin\delphi_PROJECTICNS.icns + $(BDS)\bin\delphi_PROJECTICON.ico .\$(Platform)\$(Config) cv_CreateCameraCapture false @@ -54,6 +94,85 @@ false 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= + + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_36x36.png + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_144x144.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_48x48.png + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + $(BDS)\bin\Artwork\Android\FM_SplashImage_470x320.png + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_960x720.png + true + true + true + $(BDS)\bin\Artwork\Android\FM_LauncherIcon_72x72.png + $(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png + true + Debug + 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= + true + $(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png + + + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(MSBuildProjectName) + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + true + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + Debug + + + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(MSBuildProjectName) + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + true + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + Debug + + + iPhoneAndiPad + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_152x152.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_1536x2048.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImagePortrait_768x1024.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_40x40.png + $(BDS)\bin\Artwork\iOS\iPad\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_1024x768.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_SpotlightSearchIcon_80x80.png + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_120x120.png + $(BDS)\bin\Artwork\iOS\iPad\FM_ApplicationIcon_76x76.png + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false;UIBackgroundModes= + $(BDS)\bin\Artwork\iOS\iPad\FM_LaunchImageLandscape_2048x1536.png + true + $(BDS)\bin\Artwork\iOS\iPhone\FM_ApplicationIcon_60x60.png + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= @@ -75,6 +194,15 @@ false DEBUG;$(DCC_Define) + + true + + + true + + + true + None CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= @@ -141,6 +269,10 @@ + False + False + False + False False True True diff --git a/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.res b/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.res index 93e7e94..d95ca05 100644 Binary files a/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.res and b/samples/LibDemo/cvCreateCameraCapture/cv_CreateCameraCapture.res differ diff --git a/samples/LibDemo/cvDFT/cv_DFT.dpr b/samples/LibDemo/cvDFT/cv_DFT.dpr index 46b95f9..4a41751 100644 --- 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; diff --git a/samples/LibDemo/cvMatchShapes/cv_MatchShapes2.dpr b/samples/LibDemo/cvMatchShapes/cv_MatchShapes2.dpr index 22f38c6..4fc5a96 100644 --- 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; // ñðàâíåíèå îáúåêòîâ ïî ìîìåíòàì èõ êîíòóðîâ diff --git a/samples/LibDemo/cvSegmentImage/cv_SegmentImage.dpr b/samples/LibDemo/cvSegmentImage/cv_SegmentImage.dpr index f30ae1f..3a4fb2b 100644 --- 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; diff --git a/samples/MultiDemo/CameraShift/CameraShift.dpr b/samples/MultiDemo/CameraShift/CameraShift.dpr index 45a7853..4319b65 100644 --- 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; diff --git a/samples/MultiDemo/FaceDetect/FaceDetect.dpr b/samples/MultiDemo/FaceDetect/FaceDetect.dpr index cd2637e..8f02b53 100644 --- 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 diff --git a/samples/MultiDemo/FaceDetectAndLockWorkstation/uMainForm.pas b/samples/MultiDemo/FaceDetectAndLockWorkstation/uMainForm.pas index a0c1e46..14db9d5 100644 --- 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; diff --git a/samples/MultiDemo/ObjectTracking/ObjectTrack.dpr b/samples/MultiDemo/ObjectTracking/ObjectTrack.dpr index 0199a6c..4abee00 100644 --- 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 diff --git a/samples/MultiDemo/art/art.dpr b/samples/MultiDemo/art/art.dpr index cf976aa..5f36309 100644 --- 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, diff --git a/samples/VCLDemo/vclCameraCapture/uMainForm.pas b/samples/VCLDemo/vclCameraCapture/uMainForm.pas index c776630..07ca955 100644 --- 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 diff --git a/samples/VCLDemo/vclChessboardCorners/MainForm.pas b/samples/VCLDemo/vclChessboardCorners/MainForm.pas index 07b30a4..086bf4c 100644 --- 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; diff --git a/samples/VCLDemo/vclColorTracking/uMainForm.pas b/samples/VCLDemo/vclColorTracking/uMainForm.pas index 5467fe9..2156a15 100644 --- 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 diff --git a/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj b/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj index 4a9b50a..a8dd533 100644 --- a/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj +++ b/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj @@ -1,7 +1,7 @@  {D491E4D5-5FA3-459D-9C68-210B7715C29F} - 17.2 + 18.0 VCL vclColorTracking.dpr True @@ -73,6 +73,7 @@ false + true $(BDS)\bin\default_app.manifest Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) 1033 @@ -80,6 +81,7 @@ cxPivotGridChartRS17;JvGlobus;JvMM;dxSkinSevenRS17;dxSkinBlueprintRS17;JvManagedThreads;dxSkinHighContrastRS17;dxSkinOffice2007BlackRS17;dxCoreRS17;dac170;cxPageControldxBarPopupMenuRS17;dxSkinXmas2008BlueRS17;dxPSDBTeeChartRS17;GLS_ODE;JvCrypt;dxPSTeeChartRS17;dxSkinSummer2008RS17;dxPScxSchedulerLnkRS17;dxSkinBlueRS17;dxSkinDarkRoomRS17;DBXInterBaseDriver;DataSnapServer;DataSnapCommon;dxPScxTLLnkRS17;JvNet;GLScene_RunTime;officeXPrt;JvDotNetCtrls;dxRibbonRS17;DbxCommonDriver;cxDataRS17;vclimg;dxSkinsdxBarPainterRS17;dxPSdxDBTVLnkRS17;dbxcds;DatasnapConnectorsFreePascal;dxSkinMoneyTwinsRS17;JvXPCtrls;vcldb;cxExportRS17;dxPSCoreRS17;dxBarExtItemsRS17;dxGDIPlusRS17;dxNavBarRS17;CustomIPTransport;cxLibraryRS17;cxGridRS17;dxSkinOffice2010BlackRS17;dsnap;IndyIPServer;unidac170;IndyCore;dxSkinMcSkinRS17;CloudService;dxPScxCommonRS17;FmxTeeUI;frxDB17;dxSkinsdxDLPainterRS17;dxSkiniMaginaryRS17;AnyDAC_PhysDb2_D17;JvDB;JvRuntimeDesign;dxPScxVGridLnkRS17;JclDeveloperTools;unidacfmx170;dxSkinSevenClassicRS17;dxPScxExtCommonRS17;dxPScxSSLnkRS17;dxSkinLilianRS17;fs17;dxPSdxLCLnkRS17;dxSkinOffice2010BlueRS17;bindcompfmx;dclTP_LockBox3;dxSkinOffice2010SilverRS17;vcldbx;cxSchedulerGridRS17;dbrtl;bindcomp;inetdb;JvPluginSystem;dxBarRS17;IcsCommonDXE3Run;DBXOdbcDriver;dxBarDBNavRS17;JvCmp;dxSkinWhiteprintRS17;JvTimeFramework;xmlrtl;dxSkinsdxRibbonPainterRS17;ibxpress;GLSS_OpenAL;dxDockingRS17;bindengine;vclactnband;soaprtl;FMXTee;dxADOServerModeRS17;bindcompvcl;dxBarExtDBItemsRS17;PasLib;Jcl;vclie;dxPSPrVwRibbonRS17;dxSkinOffice2007PinkRS17;IcsFmxDXE3Run;cxPageControlRS17;dxSkinscxPCPainterRS17;AnyDAC_PhysADS_D17;AnyDAC_PhysIB_D17;dxmdsRS17;dxSkinTheAsphaltWorldRS17;DBXInformixDriver;Intraweb;dxPsPrVwAdvRS17;GLSS_FMOD;dxSkinSilverRS17;dxdborRS17;DBXFirebirdDriver;dsnapcon;inet;fsDB17;FFmpegFmx_DXE3;JvPascalInterpreter;vclx;dxSkinStardustRS17;cxEditorsRS17;DBXSybaseASADriver;crcontrols170;dbexpress;EurekaLogCore;IndyIPClient;JvBDE;AnyDAC_PhysMySQL_D17;cxTreeListdxBarPopupMenuRS17;dxSkinVS2010RS17;GLCg_RunTime;GLS_NGD;ZComponent;dxThemeRS17;DBXSqliteDriver;dxPScxGridLnkRS17;fmx;JvDlgs;IndySystem;TeeDB;dxSkinValentineRS17;inetdbbde;vclib;DataSnapClient;dxSkinDevExpressStyleRS17;FFmpegRtl_DXE3;DataSnapProviderClient;DBXSybaseASEDriver;cxBarEditItemRS17;AnyDAC_PhysMSAcc_D17;dxServerModeRS17;cxPivotGridOLAPRS17;cxSchedulerRS17;MetropolisUILiveTile;dxSkinPumpkinRS17;dxPSLnksRS17;AnyDAC_PhysSQLITE_D17;dxPSdxDBOCLnkRS17;cxVerticalGridRS17;dxSkinSpringTimeRS17;vcldsnap;GLS_Computing_RunTime;dacvcl170;dxSkinDevExpressDarkStyleRS17;DBXDb2Driver;AnyDAC_ComI_D17;DBXOracleDriver;dxSkinLiquidSkyRS17;JvCore;AnyDAC_PhysMSSQL_D17;vclribbon;AnyDAC_Comp_D17;cxSpreadSheetRS17;AnyDAC_PhysODBC_D17;fmxase;vcl;dxSkinOffice2007SilverRS17;AnyDAC_PhysPg_D17;CodeSiteExpressPkg;DBXMSSQLDriver;IndyIPCommon;dxPSdxOCLnkRS17;FFmpegVcl_DXE3;dcldxSkinsCoreRS17;JvAppFrm;AnyDAC_PhysASA_D17;inetdbxpress;webdsnap;IcsVclDXE3Run;dxSkinCoffeeRS17;AnyDAC_PhysOracle_D17;JvDocking;adortl;dxSkinscxSchedulerPainterRS17;JvWizards;frx17;JvHMI;dxtrmdRS17;dxPScxPCProdRS17;AnyDAC_GUIxForms_D17;JvBands;ZDbc;rtl;DbxClientDriver;dxTabbedMDIRS17;dxSkinSharpPlusRS17;dxComnRS17;ZPlain;dxSkinsCoreRS17;dxSkinLondonLiquidSkyRS17;dxdbtrRS17;JclContainers;Tee;JvSystem;dxorgcRS17;svnui;dxSkinBlackRS17;JvControls;IndyProtocols;DBXMySQLDriver;dxLayoutControlRS17;bindcompdbx;TeeUI;JvJans;JvPrintPreview;JvPageComps;JvStdCtrls;JvCustom;dxSkinOffice2007BlueRS17;dxPScxPivotGridLnkRS17;dxSpellCheckerRS17;ZCore;vcltouch;dxSkinOffice2007GreenRS17;dxSkinSharpRS17;websnap;dxSkinFoggyRS17;dxTileControlRS17;VclSmp;dxSkinDarkSideRS17;cxPivotGridRS17;DataSnapConnectors;AnyDAC_Phys_D17;dacfmx170;fmxobj;cxTreeListRS17;JclVcl;dxPSdxFCLnkRS17;dxSkinGlassOceansRS17;unidacvcl170;ZParseSql;frxe17;svn;dxFlowChartRS17;fmxdae;dxSkinsdxNavBarPainterRS17;bdertl;ExpertTools;DataSnapIndy10ServerTransport;dxDBXServerModeRS17;dxSkinCaramelRS17;$(DCC_UsePackage) + true Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) $(BDS)\bin\default_app.manifest 1033 @@ -95,6 +97,7 @@ true + true ..\..\..\bin\$(Platform) $(BDS)\bin\default_app.manifest 1033 @@ -102,6 +105,7 @@ false + true ..\..\..\bin\$(Platform) $(BDS)\bin\default_app.manifest 1033 @@ -114,12 +118,14 @@ 0 + true ..\..\..\bin\$(Platform) true 1033 $(BDS)\bin\default_app.manifest + true ..\..\..\bin\$(Platform) $(BDS)\bin\default_app.manifest 1033 @@ -192,67 +198,109 @@ Microsoft Office XP Sample Automation Server Wrapper Components - - + + 1 - .dylib + + 1 + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + Contents\MacOS 0 - .bpl + + + 1 Contents\MacOS 1 - .dylib + + + + library\lib\mips + 1 + + + 1 - .dylib + + + 1 1 - .dylib - - - 1 - .dylib - + 0 - .dll;.bpl + + + 1 Contents\MacOS 1 - .dylib - - - 1 - .dylib 1 - .dylib + + + library\lib\armeabi-v7a + 1 + + + 1 - + + + 0 + + + Contents\MacOS + 1 + .framework + + + + + 1 + 1 - - 1 - 1 - - - Contents + + + library\lib\x86 1 @@ -266,121 +314,97 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + Contents\MacOS + 1 + + + + + 1 + + + 1 + + + 1 + + res\drawable-normal 1 - - - library\lib\x86 - 1 - - - - - 1 - - - 1 - - - 1 - - - - - ../ - 1 - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xlarge - 1 - - res\drawable-xhdpi 1 - + + + res\drawable-large + 1 + + + + + 1 + 1 - - 1 - 1 - - - res\drawable-xxhdpi - 1 - - - - - library\lib\mips - 1 - - - - - res\drawable - 1 - - - - - Contents\MacOS - 1 - - - 1 - - - 0 - - - - - Contents\MacOS - 1 - .framework - - - 0 - - - - - res\drawable-small - 1 - - ../ @@ -391,172 +415,11 @@ 1 - - - Contents\MacOS - 1 - - - 1 - - - Contents\MacOS - 0 - - - - - classes - 1 - - - - - 1 - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable - 1 - - - - - Contents\Resources - 1 - - - - - 1 - - - 1 - - - - - 1 - - - 1 - - - 1 - - - + library\lib\armeabi-v7a 1 - - 1 - - - 0 - - - Contents\MacOS - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi - 1 - - - - - res\drawable-large - 1 - - - - - 0 - - - 0 - - - 0 - - - Contents\MacOS - 0 - - - 0 - - - 0 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-ldpi - 1 - - - - - res\values - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-mdpi - 1 - @@ -564,18 +427,167 @@ 1 + + + Contents + 1 + + + + + ../ + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + 1 + + + res\drawable + 1 + + + + + 0 + + + 0 + + + Contents\Resources\StartUp\ + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + Contents\MacOS + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + - - - - + + + + True @@ -588,11 +600,3 @@ - - diff --git a/samples/VCLDemo/vclColorTracking/vclColorTracking.res b/samples/VCLDemo/vclColorTracking/vclColorTracking.res index 0f3facb..8b341b4 100644 Binary files a/samples/VCLDemo/vclColorTracking/vclColorTracking.res and b/samples/VCLDemo/vclColorTracking/vclColorTracking.res differ diff --git a/samples/VCLDemo/vclColorTracking2/uMainForm.pas b/samples/VCLDemo/vclColorTracking2/uMainForm.pas index e454137..d0a7216 100644 --- 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; diff --git a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj index 8a723f7..ac9d75d 100644 --- a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj +++ b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj @@ -7,12 +7,17 @@ 3 Application VCL - 17.2 + 18.0 Win32 true + + true + Base + true + true Base @@ -73,6 +78,9 @@ false CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=;CFBundleDisplayName=;UIDeviceFamily=;CFBundleIdentifier=;CFBundleVersion=;CFBundlePackageType=;CFBundleSignature=;CFBundleAllowMixedLocalizations=;UISupportedInterfaceOrientations=;CFBundleExecutable=;CFBundleResourceSpecification=;LSRequiresIPhoneOS=;CFBundleInfoDictionaryVersion=;CFBundleDevelopmentRegion=;package=;label=;versionCode=;versionName=;persistent=;restoreAnyVersion=;installLocation=;largeHeap=;theme= + + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) true @@ -218,11 +226,3 @@ - - diff --git a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.res b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.res index 0f3facb..5dc90f0 100644 Binary files a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.res and b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.res differ diff --git a/samples/VCLDemo/vclIPCameraCapture/uMainForm.pas b/samples/VCLDemo/vclIPCameraCapture/uMainForm.pas index f255b63..5ccb227 100644 --- 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 diff --git a/samples/VCLDemo/vclPCArecognition/uMainForm.pas b/samples/VCLDemo/vclPCArecognition/uMainForm.pas index c7f67ba..dbb8766 100644 --- 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 diff --git a/source/OpenCV.inc b/source/OpenCV.inc index bc8c06a..781b8f9 100644 --- a/source/OpenCV.inc +++ b/source/OpenCV.inc @@ -900,6 +900,27 @@ {$UNDEF UNKNOWN_COMPILER_VERSION} {$ENDIF VER290} + {$IFDEF VER300} // RAD Studio Delphi 10 Seattle + {$DEFINE BDS} + {$DEFINE BDS15} + {$DEFINE COMPILER21} //temporary + {$DEFINE COMPILER22} + {$IFDEF BCB} + {$DEFINE BCB21} + {$DEFINE BCB22} + {$ELSE} + {$DEFINE DELPHI21} + {$DEFINE DELPHIXE7} // synonym to DELPHI21 + {$DEFINE DELPHICOMPILER21} + {$DEFINE DELPHI22} + {$DEFINE DELPHIXE8} // synonym to DELPHI22 + {$DEFINE DELPHICOMPILER22} + {$ENDIF BCB} + {$DEFINE RTL280_UP} + {$DEFINE RTL290_UP} + {$UNDEF UNKNOWN_COMPILER_VERSION} + {$ENDIF VER290} + {$IFDEF UNKNOWN_COMPILER_VERSION} // adjust for newer version (always use latest version) {$DEFINE BDS} {$DEFINE BDS15} diff --git a/source/component/Delphi 10 Seattle/RAD Studio 10 Seattle.groupproj b/source/component/Delphi 10 Seattle/RAD Studio 10 Seattle.groupproj new file mode 100644 index 0000000..11991c6 --- /dev/null +++ b/source/component/Delphi 10 Seattle/RAD Studio 10 Seattle.groupproj @@ -0,0 +1,84 @@ + + + {BD0EE7BD-ED70-4DCA-AA92-522F18635A55} + + + + + + + ocvOpenCV300.dproj + + + dclCommonOpenCV300.dproj + + + dclCommonOpenCV300.dproj + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dpk b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dpk new file mode 100644 index 0000000..0b7550b --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dpk @@ -0,0 +1,41 @@ +package dclCommonOpenCV300; + +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS OFF} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION ON} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO OFF} +{$SAFEDIVIDE OFF} +{$STACKFRAMES OFF} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE RELEASE} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'OpenCV Component'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + ocvOpenCV300, + designide; + +contains + ocv.comp.IOProperties in '..\ocv.comp.IOProperties.pas', + ocv.comp.Register in '..\ocv.comp.Register.pas'; + +end. diff --git a/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dproj b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dproj new file mode 100644 index 0000000..f60414c --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dproj @@ -0,0 +1,541 @@ + + + {F006D3F9-654A-4A44-A67B-098BC79DB69C} + dclCommonOpenCV300.dpk + True + Release + 1 + Package + None + 18.0 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + ..;..\..;..\..\..\resource\facedetectxml;..\..\ffmpeg;..\..\opengl;..\..\sdl;..\..\utils;$(DCC_UnitSearchPath) + .\$(Platform)\$(Config) + false + false + false + true + false + OpenCV Component + false + true + 1049 + 00400000 + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + dclCommonOpenCV300 + true + true + + + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + Debug + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar;hardwareAccelerated=true + + + OpenCV210;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + ocvOpenCV220;$(DCC_UsePackage) + + + RELEASE;$(DCC_Define) + 0 + 0 + false + + + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + true + false + DEBUG;$(DCC_Define) + + + 1033 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=05.10.2014 2:15:05 + + + + MainSource + + + + + + + BITMAP + TOCVFILESOURCE + + + BITMAP + TOCVIMAGEOPERATION + + + BITMAP + TOCVIPCAMSOURCE + + + BITMAP + TOCVFFMPEGIPCAMSOURCE + + + BITMAP + TOCVCAMERASOURCE + + + BITMAP + TOCVVIDEOWRITER + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + dclCommonOpenCV300.dpk + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + False + False + False + True + False + + + + + true + + + + + true + + + + + true + + + + + true + + + + + dclCommonOpenCV300.bpl + true + + + + + dclCommonOpenCV300.bpl + true + + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + + + library\lib\mips + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable-hdpi + 1 + + + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + + + + + + + + + + 12 + + + + + diff --git a/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dres b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dres new file mode 100644 index 0000000..0182e4e Binary files /dev/null and b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.dres differ diff --git a/source/component/Delphi22/dclFFMSource.res b/source/component/Delphi 10 Seattle/dclCommonOpenCV300.res similarity index 100% rename from source/component/Delphi22/dclFFMSource.res rename to source/component/Delphi 10 Seattle/dclCommonOpenCV300.res diff --git a/source/component/Delphi 10 Seattle/dclCommonOpenCV300Resource.rc b/source/component/Delphi 10 Seattle/dclCommonOpenCV300Resource.rc new file mode 100644 index 0000000..0005090 --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclCommonOpenCV300Resource.rc @@ -0,0 +1,6 @@ +TOCVFILESOURCE BITMAP "..\\Resource\\filesource.bmp" +TOCVIMAGEOPERATION BITMAP "..\\Resource\\imagetransform.bmp" +TOCVIPCAMSOURCE BITMAP "..\\Resource\\ipcamera.bmp" +TOCVFFMPEGIPCAMSOURCE BITMAP "..\\Resource\\ipcameraffmpeg.bmp" +TOCVCAMERASOURCE BITMAP "..\\Resource\\webcamera.bmp" +TOCVVIDEOWRITER BITMAP "..\\Resource\\wideowriter.bmp" diff --git a/source/component/Delphi22/dclFFMSource.dpk b/source/component/Delphi 10 Seattle/dclFFMSource300.dpk similarity index 91% rename from source/component/Delphi22/dclFFMSource.dpk rename to source/component/Delphi 10 Seattle/dclFFMSource300.dpk index a033c05..c293c2c 100644 --- a/source/component/Delphi22/dclFFMSource.dpk +++ b/source/component/Delphi 10 Seattle/dclFFMSource300.dpk @@ -1,4 +1,4 @@ -package dclFFMSource; +package dclFFMSource300; {$R *.res} {$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} @@ -28,8 +28,8 @@ package dclFFMSource; {$IMPLICITBUILD ON} requires - ocvOpenCV210, - dclCommonOpenCV210, + ocvOpenCV300, + dclCommonOpenCV300, designide; contains diff --git a/source/component/Delphi22/dclFFMSource.dproj b/source/component/Delphi 10 Seattle/dclFFMSource300.dproj similarity index 95% rename from source/component/Delphi22/dclFFMSource.dproj rename to source/component/Delphi 10 Seattle/dclFFMSource300.dproj index c6f0429..6ba09f9 100644 --- a/source/component/Delphi22/dclFFMSource.dproj +++ b/source/component/Delphi 10 Seattle/dclFFMSource300.dproj @@ -1,8 +1,8 @@  {3BC74F10-002A-41D7-B09F-6458FF2CE8F4} - dclFFMSource.dpk - 17.2 + dclFFMSource300.dpk + 18.0 None True Debug @@ -18,6 +18,16 @@ Base true + + true + Base + true + + + true + Base + true + true Base @@ -38,16 +48,6 @@ Base true - - true - Base - true - - - true - Base - true - true Base @@ -69,7 +69,7 @@ true All true - dclFFMSource + dclFFMSource300 .\$(Platform)\$(Config) .\$(Platform)\$(Config) false @@ -83,22 +83,17 @@ rtl;$(DCC_UsePackage) None - - rtl;$(DCC_UsePackage) - None - - - rtl;$(DCC_UsePackage) - - - rtl;ocvOpenCV210;$(DCC_UsePackage) + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false true - 1033 - CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) - - - rtl;ocvOpenCV210;$(DCC_UsePackage) + rtl;$(DCC_UsePackage);$(DCC_UsePackage) + $(MSBuildProjectName) + Debug + Base + true + iPhoneAndiPad + None + true CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false @@ -112,17 +107,22 @@ None true - - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false - true - rtl;$(DCC_UsePackage);$(DCC_UsePackage) - $(MSBuildProjectName) - Debug - Base - true - iPhoneAndiPad + + rtl;$(DCC_UsePackage) None - true + + + rtl;$(DCC_UsePackage) + + + rtl;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + true + 1033 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + + + rtl;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) DEBUG;$(DCC_Define) @@ -145,8 +145,8 @@ MainSource - - + + @@ -168,20 +168,17 @@ - dclFFMSource.dpk + dclFFMSource300.dpk - - + + - dclFFMSource.bpl + dclFFMSource300.bpl true - - - true - + true @@ -196,50 +193,103 @@ true - - - 1 - .dylib + + + true + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + Contents\MacOS 0 - .bpl 1 - .dylib + + + + library\lib\mips + 1 + + + 1 - .dylib - - 1 - .dylib - - - - - 1 - .dylib - - - 0 - .dll;.bpl - - - 1 - - 1 - 1 - + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF @@ -250,256 +300,90 @@ 1 + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + res\drawable-normal 1 - - - library\lib\x86 - 1 - - - - - 1 - - - 1 - - - 1 - - - - - - library\lib\armeabi-v7a - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xlarge - 1 - - res\drawable-xhdpi 1 - - - 1 - - - 1 - - - 1 - - - - - res\drawable-xxhdpi - 1 - - - - - library\lib\mips - 1 - - - - - res\drawable - 1 - - - - - 1 - - - 1 - - - 0 - - - - - 1 - .framework - - - 0 - - - - - res\drawable-small - 1 - - - - - - 1 - - - Contents\MacOS - 0 - - - - - classes - 1 - - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable - 1 - - - - - Contents\Resources - 1 - - - - - - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi-v7a - 1 - - - 1 - - - 0 - - - 1 - - - 1 - - - 1 - - - - - library\lib\armeabi - 1 - - res\drawable-large 1 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - + 1 - + 1 1 - + + - res\drawable-ldpi - 1 - - - - - res\values - 1 - - - - - 1 - - - 1 - - - 1 - - - - - res\drawable-mdpi + library\lib\armeabi-v7a 1 @@ -509,18 +393,142 @@ 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + 1 - - - + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + - - + + + + + False diff --git a/source/component/Delphi 10 Seattle/dclFFMSource300.res b/source/component/Delphi 10 Seattle/dclFFMSource300.res new file mode 100644 index 0000000..a64cea3 Binary files /dev/null and b/source/component/Delphi 10 Seattle/dclFFMSource300.res differ diff --git a/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dpk b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dpk new file mode 100644 index 0000000..f57d00b --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dpk @@ -0,0 +1,42 @@ +package dclFMXOpenCV300; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS OFF} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION ON} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO OFF} +{$SAFEDIVIDE OFF} +{$STACKFRAMES OFF} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE RELEASE} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'OpenCV Component'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + fmx, + ocvOpenCV300, + dclCommonOpenCV300, + designide; + +contains + ocv.comp.RegisterFMX in '..\ocv.comp.RegisterFMX.pas', + ocv.comp.ViewFMX in '..\ocv.comp.ViewFMX.pas'; + +end. diff --git a/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dproj b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dproj new file mode 100644 index 0000000..f75c952 --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.dproj @@ -0,0 +1,588 @@ + + + {0D98CAB7-4425-4E50-9817-42B27A38348B} + dclFMXOpenCV300.dpk + True + Release + 1 + Package + None + 18.0 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + ..;..\..;..\..\..\resource\facedetectxml;..\..\ffmpeg;..\..\opengl;..\..\sdl;..\..\utils;$(DCC_UnitSearchPath) + .\$(Platform)\$(Config) + false + false + false + true + false + OpenCV Component + false + true + 1049 + 00400000 + System;Xml;Data;Datasnap;Web;Soap;REST.Authenticator.OAuth.WebForm;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + dclFMXOpenCV300 + true + true + + + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + fmx;$(DCC_UsePackage) + Debug + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar;hardwareAccelerated=true + + + fmx;$(DCC_UsePackage);$(DCC_UsePackage) + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false + $(MSBuildProjectName) + Debug + true + Base + true + true + iPhoneAndiPad + + + fmx;$(DCC_UsePackage);$(DCC_UsePackage) + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false + $(MSBuildProjectName) + Debug + true + Base + true + true + iPhoneAndiPad + + + fmx;$(DCC_UsePackage) + + + fmx;$(DCC_UsePackage) + + + fmx;OpenCV210;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + fmx;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + + + RELEASE;$(DCC_Define) + 0 + 0 + false + + + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + true + false + DEBUG;$(DCC_Define) + + + true + + + true + + + 1033 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=05.10.2014 2:15:05 + + + + MainSource + + + + + + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + dclFMXOpenCV300.dpk + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + False + False + False + False + False + True + False + + + + + dclFMXOpenCV300.bpl + true + + + + + true + + + + + true + + + + + true + + + + + true + + + + + dclFMXOpenCV300.bpl + true + + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + + + library\lib\mips + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable-hdpi + 1 + + + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + + + + + + + + + + 12 + + + + + diff --git a/source/component/Delphi 10 Seattle/dclFMXOpenCV300.res b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.res new file mode 100644 index 0000000..a64cea3 Binary files /dev/null and b/source/component/Delphi 10 Seattle/dclFMXOpenCV300.res differ diff --git a/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dpk b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dpk new file mode 100644 index 0000000..d4ff121 --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dpk @@ -0,0 +1,42 @@ +package dclVCLOpenCV300; + +{$R *.res} +{$R *.dres} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS OFF} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION ON} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO OFF} +{$SAFEDIVIDE OFF} +{$STACKFRAMES OFF} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE RELEASE} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'OpenCV Component'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + ocvOpenCV300, + dclCommonOpenCV300, + designide; + +contains + ocv.comp.RegisterVCL in '..\ocv.comp.RegisterVCL.pas', + ocv.comp.View in '..\ocv.comp.View.pas'; + +end. diff --git a/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dproj b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dproj new file mode 100644 index 0000000..b62075b --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dproj @@ -0,0 +1,522 @@ + + + {234FC568-51AA-4997-BDE5-7B9A3BEEC85B} + dclVCLOpenCV300.dpk + True + Release + 1 + Package + None + 18.0 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + ..;..\..;..\..\..\resource\facedetectxml;..\..\ffmpeg;..\..\opengl;..\..\sdl;..\..\utils;$(DCC_UnitSearchPath) + .\$(Platform)\$(Config) + false + false + false + true + false + OpenCV Component + false + true + 1049 + 00400000 + System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + dclVCLOpenCV300 + true + true + + + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + Debug + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar;hardwareAccelerated=true + + + OpenCV210;ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + ocvOpenCV210;ocvOpenCV220;$(DCC_UsePackage) + + + RELEASE;$(DCC_Define) + 0 + 0 + false + + + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + true + false + DEBUG;$(DCC_Define) + + + 1033 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=05.10.2014 2:15:06 + + + + MainSource + + + + + + + + BITMAP + TOCVVIEW + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + dclVCLOpenCV300.dpk + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + False + False + False + True + False + + + + + true + + + + + true + + + + + true + + + + + true + + + + + dclVCLOpenCV300.bpl + true + + + + + dclVCLOpenCV300.bpl + true + + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + + + library\lib\mips + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable-hdpi + 1 + + + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + + + + + + + + + + 12 + + + + + diff --git a/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dres b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dres new file mode 100644 index 0000000..fb3362c Binary files /dev/null and b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.dres differ diff --git a/source/component/Delphi 10 Seattle/dclVCLOpenCV300.res b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.res new file mode 100644 index 0000000..a64cea3 Binary files /dev/null and b/source/component/Delphi 10 Seattle/dclVCLOpenCV300.res differ diff --git a/source/component/Delphi 10 Seattle/dclVCLOpenCV300Resource.rc b/source/component/Delphi 10 Seattle/dclVCLOpenCV300Resource.rc new file mode 100644 index 0000000..e91a96b --- /dev/null +++ b/source/component/Delphi 10 Seattle/dclVCLOpenCV300Resource.rc @@ -0,0 +1 @@ +TOCVVIEW BITMAP "..\\Resource\\view.bmp" diff --git a/source/component/Delphi 10 Seattle/ocvOpenCV300.dpk b/source/component/Delphi 10 Seattle/ocvOpenCV300.dpk new file mode 100644 index 0000000..eda1cf6 --- /dev/null +++ b/source/component/Delphi 10 Seattle/ocvOpenCV300.dpk @@ -0,0 +1,35 @@ +package ocvOpenCV300; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS OFF} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION ON} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO OFF} +{$SAFEDIVIDE OFF} +{$STACKFRAMES OFF} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE RELEASE} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'OpenCV Component'} +{$RUNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl; + +end. diff --git a/source/component/Delphi 10 Seattle/ocvOpenCV300.dproj b/source/component/Delphi 10 Seattle/ocvOpenCV300.dproj new file mode 100644 index 0000000..bed9fc8 --- /dev/null +++ b/source/component/Delphi 10 Seattle/ocvOpenCV300.dproj @@ -0,0 +1,489 @@ + + + {216046C8-B2AE-4C69-8DDB-93C4F72B1784} + ocvOpenCV300.dpk + True + Release + 3 + Package + VCL + 18.0 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_1 + true + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + ..;..\..;..\..\..\resource\facedetectxml;..\..\ffmpeg;..\..\opengl;..\..\sdl;..\..\utils;$(DCC_UnitSearchPath) + .\$(Platform)\$(Config) + false + false + false + false + true + false + OpenCV Component + true + 1049 + 00400000 + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + ocvOpenCV300 + true + true + + + android-support-v4.dex.jar;apk-expansion.dex.jar;cloud-messaging.dex.jar;fmx.dex.jar;google-analytics-v2.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar;google-play-services.dex.jar + Debug + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=preferExternal;largeHeap=False;theme=TitleBar;hardwareAccelerated=true + + + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + true + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + 1033 + + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + true + 1033 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + RELEASE;$(DCC_Define) + 0 + 0 + false + + + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= + + + true + false + DEBUG;$(DCC_Define) + + + 1033 + true + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;LastCompiledTime=05.10.2014 2:28:05 + + + + MainSource + + + + Cfg_2 + Base + + + Base + + + Cfg_1 + Base + + + + Delphi.Personality.12 + Package + + + + ocvOpenCV300.dpk + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + False + False + True + True + + + + + ocvOpenCV300.bpl + true + + + + + + Contents\Resources + 1 + + + + + classes + 1 + + + + + res\drawable-xxhdpi + 1 + + + + + Contents\MacOS + 0 + + + 1 + + + + + library\lib\mips + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 0 + + + 1 + + + 1 + + + 1 + + + library\lib\armeabi-v7a + 1 + + + 1 + + + + + 0 + + + 1 + .framework + + + + + 1 + + + 1 + + + 1 + + + + + library\lib\x86 + 1 + + + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + ..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi + 1 + + + + + 0 + + + 1 + + + 1 + + + + + 1 + + + 1 + + + 1 + + + + + res\drawable-normal + 1 + + + + + res\drawable-xhdpi + 1 + + + + + res\drawable-large + 1 + + + + + 1 + + + 1 + + + 1 + + + + + + library\lib\armeabi-v7a + 1 + + + + + res\drawable-hdpi + 1 + + + + + + + 1 + + + 1 + + + 1 + + + + + res\values + 1 + + + + + res\drawable-small + 1 + + + + + res\drawable + 1 + + + + + 1 + + + 1 + + + 1 + + + + + 1 + + + + + res\drawable + 1 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + library\lib\armeabi-v7a + 1 + + + + + 0 + .bpl + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + 1 + .dylib + + + + + res\drawable-mdpi + 1 + + + + + res\drawable-xlarge + 1 + + + + + res\drawable-ldpi + 1 + + + + + 0 + .dll;.bpl + + + 1 + .dylib + + + + + + + + + + + + 12 + + + + + diff --git a/source/component/Delphi 10 Seattle/ocvOpenCV300.res b/source/component/Delphi 10 Seattle/ocvOpenCV300.res new file mode 100644 index 0000000..27efe49 Binary files /dev/null and b/source/component/Delphi 10 Seattle/ocvOpenCV300.res differ diff --git a/source/component/ocv.comp.FFMSource.pas b/source/component/ocv.comp.FFMSource.pas index aa863c7..17e8f84 100644 --- a/source/component/ocv.comp.FFMSource.pas +++ b/source/component/ocv.comp.FFMSource.pas @@ -61,8 +61,8 @@ Type FReconnectDelay: Cardinal; FOnIPCamEvent: TOnocvFFMpegIPCamEvent; procedure SetReconnectDelay(const Value: Cardinal); - procedure TerminateSourceThread; override; protected + procedure TerminateSourceThread; override; function GetIPCamTarget: AnsiString; procedure SetEnabled(Value: Boolean); override; procedure Loaded; override; diff --git a/source/component/ocv.comp.ImageOperation.pas b/source/component/ocv.comp.ImageOperation.pas index 1f04870..dfdd8ba 100644 --- 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} diff --git a/source/component/ocv.comp.Proc.pas b/source/component/ocv.comp.Proc.pas index 6d25947..a2b18e2 100644 --- 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} diff --git a/source/component/ocv.comp.Types.pas b/source/component/ocv.comp.Types.pas index 2370254..6be5a1a 100644 --- 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 diff --git a/source/component/ocv.comp.VideoWriter.pas b/source/component/ocv.comp.VideoWriter.pas index 8992fe9..1b5e281 100644 --- a/source/component/ocv.comp.VideoWriter.pas +++ b/source/component/ocv.comp.VideoWriter.pas @@ -178,7 +178,7 @@ end; procedure TocvVideoWriter.SetFourCC(const Value: AnsiString); begin - if not SameText(FFourCC, Value) then + if not AnsiSameText(FFourCC, Value) then begin CloseWriter; FFourCC := Value; diff --git a/source/component/ocv.comp.View.pas b/source/component/ocv.comp.View.pas index 6609ab7..280df9c 100644 --- 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 } diff --git a/source/component/ocv.comp.ViewFMX.pas b/source/component/ocv.comp.ViewFMX.pas index 3f900b2..3f5034a 100644 --- a/source/component/ocv.comp.ViewFMX.pas +++ b/source/component/ocv.comp.ViewFMX.pas @@ -178,11 +178,11 @@ begin end; procedure TocvViewFMX.Paint; -var - M: TBitmapData; - i: Integer; - SrcData, DestData: pByte; - nC: Integer; +//var +// M: TBitmapData; +// i: Integer; +// SrcData, DestData: pByte; +// nC: Integer; begin if (csDesigning in ComponentState) then begin diff --git a/source/ocv.core_c.pas b/source/ocv.core_c.pas index de5fd17..6d42df9 100644 --- a/source/ocv.core_c.pas +++ b/source/ocv.core_c.pas @@ -2350,12 +2350,12 @@ procedure cvSet(arr: pCvArr; value: TCvScalar; procedure cvSet(mat: pCvMat; i, j: Integer; val: Single); {$IFDEF USE_INLINE}inline; {$ENDIF} var - type_: Integer; +// type_: Integer; ptr: pByte; pf: PSingle; begin - type_ := CV_MAT_TYPE(mat._type); - assert((i < mat^.rows) and (j < mat^.cols) and (type_ = CV_32FC1)); +// type_ := CV_MAT_TYPE(mat._type); + assert((i < mat^.rows) and (j < mat^.cols) and (CV_MAT_TYPE(mat._type) = CV_32FC1)); ptr := mat^.data; Inc(ptr, mat.step * i + sizeof(Single) * j); pf := PSingle(ptr); @@ -2518,12 +2518,12 @@ function cvGet( const mat: pCvMat; i, j: Integer): Single; {$IFDEF USE_INLINE}inline; {$ENDIF} var - type_: Integer; +// type_: Integer; ptr: pByte; pf: PSingle; begin - type_ := CV_MAT_TYPE(mat^._type); - assert((i < mat^.rows) and (j < mat^.cols) and (type_ = CV_32FC1)); +// type_ := CV_MAT_TYPE(mat^._type); + assert((i < mat^.rows) and (j < mat^.cols) and (CV_MAT_TYPE(mat^._type) = CV_32FC1)); ptr := mat^.data; Inc(ptr, mat.step * i + sizeof(Single) * j); pf := PSingle(ptr); diff --git a/source/ocv.highgui.pas b/source/ocv.highgui.pas index e86e428..683a2ba 100644 --- 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;