diff --git a/.gitignore b/.gitignore index d18c4df..c011513 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,15 @@ -/!DS! -/!Work! -/!Install! -/bin/carnumdetect.ini -/bin/*.bsc -/bin/vclFaceRecogData -/bin/StereoSample/Aloe/*.png -/bin/StereoSample/Aloe/dmin.txt -/bin/Result/*.* -/opencv_classes/opencv_classes.sdf +# Directory Win32 +Win64 __history Debug Release ipch lib +# filemask +/resource/result/*.* +*.ini +*.bsc *.bsc *.pgm *.~* @@ -38,10 +34,4 @@ lib *.suo *.vlb *.sdf -eng.* -/3rdParty/!leptonica -/3rdParty/!tesseract -/3rdParty/!tesseract_classes -/component/ModelSupport_OpenCV/*.txaPackage -/component/ModelSupport_OpenCV -/samples/!Tesseract-OCR +*.txaPackage \ No newline at end of file diff --git a/samples/Components/ComponentsDemo.groupproj b/samples/Components/ComponentsDemo.groupproj new file mode 100644 index 0000000..b6fd807 --- /dev/null +++ b/samples/Components/ComponentsDemo.groupproj @@ -0,0 +1,48 @@ + + + {7026F0DB-63C8-46BA-A598-645C2F257621} + + + + + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/Components/cMatchTemplate/cMatchTemplate.dproj b/samples/Components/cMatchTemplate/cMatchTemplate.dproj index f21fd10..e24548a 100644 --- a/samples/Components/cMatchTemplate/cMatchTemplate.dproj +++ b/samples/Components/cMatchTemplate/cMatchTemplate.dproj @@ -6,7 +6,7 @@ cMatchTemplate.dpr True Release - Win32 + Win64 3 Application @@ -65,7 +65,7 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= cMatchTemplate .\$(Platform)\$(Config) - .\$(Platform)\$(Config) + ..\..\..\bin\$(Platform) false false false @@ -73,7 +73,6 @@ false - ..\..\..\bin Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) true dxSkinOffice2007BlackRS19;JvGlobus;JvMM;JvManagedThreads;dxSkinLiquidSkyRS19;cxBarEditItemRS19;OverbyteIcsDXE5Run;FireDACPgDriver;dxWizardControlRS19;dxPScxCommonRS19;tmswizdXE5;dxThemeRS19;JvCrypt;XiButtonXE4;cxGridRS19;dxPScxExtCommonRS19;DBXInterBaseDriver;DataSnapServer;DataSnapCommon;cxSchedulerRS19;JvNet;JvDotNetCtrls;DbxCommonDriver;OpenCV;vclimg;dbxcds;dxFlowChartRS19;DatasnapConnectorsFreePascal;JvXPCtrls;dxdbtrRS19;dxSkinSpringTimeRS19;vcldb;dxdborRS19;dxDockingRS19;dxSkinsdxDLPainterRS19;cxSpreadSheetRS19;dxtrmdRS19;dxSpellCheckerRS19;CustomIPTransport;dxTileControlRS19;dsnap;IndyIPServer;dxPSCoreRS19;dxSkinFoggyRS19;IndyCore;cxSchedulerGridRS19;cxPivotGridOLAPRS19;dxSkinStardustRS19;CloudService;FmxTeeUI;FireDACIBDriver;dxSkinXmas2008BlueRS19;JvDB;JvRuntimeDesign;dxSkinValentineRS19;fsIBX20;dsnapxml;dxPScxSchedulerLnkRS19;dxSkinDarkSideRS19;FireDACDb2Driver;dxSkinLondonLiquidSkyRS19;JclDeveloperTools;dxBarExtDBItemsRS19;dxTabbedMDIRS19;dxSkinOffice2013WhiteRS19;dxSkinSharpRS19;bindcompfmx;dxSkinBlueprintRS19;dxSkinOffice2007PinkRS19;frx20;vcldbx;cxExportRS19;FireDACODBCDriver;RESTBackendComponents;dxSkinCoffeeRS19;dbrtl;FireDACCommon;bindcomp;inetdb;dxSkinBlueRS19;JvPluginSystem;dxServerModeRS19;DBXOdbcDriver;JvCmp;vclFireDAC;dxSkinMoneyTwinsRS19;cxPivotGridChartRS19;xmlrtl;dxSkiniMaginaryRS19;ibxpress;JvTimeFramework;dxSkinOffice2007GreenRS19;FireDACCommonDriver;bindengine;vclactnband;soaprtl;FMXTee;dxRibbonRS19;bindcompvcl;dxADOServerModeRS19;Jcl;vclie;dxPSdxLCLnkRS19;dxSkinBlackRS19;dxSkinOffice2010BlackRS19;dxSkinSevenClassicRS19;FireDACMSSQLDriver;DBXInformixDriver;Intraweb;DataSnapServerMidas;dsnapcon;DBXFirebirdDriver;dxSkinsdxNavBarPainterRS19;inet;dxPSdxFCLnkRS19;dxSkinscxSchedulerPainterRS19;JvPascalInterpreter;FireDACMySQLDriver;soapmidas;vclx;dxPSPrVwRibbonRS19;dxPSDBTeeChartRS19;DBXSybaseASADriver;RESTComponents;dxSkinLilianRS19;dxSkinscxPCPainterRS19;dbexpress;IndyIPClient;JvBDE;tmsdXE5;cxSchedulerTreeBrowserRS19;dxPScxSSLnkRS19;dxPScxPivotGridLnkRS19;dxSkinSharpPlusRS19;FireDACSqliteDriver;autoupgrXE5;FireDACDSDriver;ZComponent;DBXSqliteDriver;dxPSdxDBTVLnkRS19;dxSkinOffice2007BlueRS19;cxDataRS19;cxLibraryRS19;fmx;JvDlgs;IndySystem;RVButtonXE6;TeeDB;tethering;dxPsPrVwAdvRS19;dxSkinHighContrastRS19;inetdbbde;vclib;DataSnapClient;DataSnapProviderClient;DBXSybaseASEDriver;dxmdsRS19;dxSkinOffice2010SilverRS19;dxSkinsdxBarPainterRS19;fsBDE20;MetropolisUILiveTile;dxPSdxOCLnkRS19;vcldsnap;fmxFireDAC;DBXDb2Driver;dxSkinDevExpressDarkStyleRS19;DBXOracleDriver;dxBarDBNavRS19;JvCore;vclribbon;dxSkinSilverRS19;dxSkinVS2010RS19;fmxase;vcl;dxPSdxDBOCLnkRS19;DBXMSSQLDriver;IndyIPCommon;CodeSiteExpressPkg;dxBarRS19;cxTreeListdxBarPopupMenuRS19;DataSnapFireDAC;FireDACDBXDriver;JvAppFrm;soapserver;dxFireDACServerModeRS19;inetdbxpress;fsTee20;frxTee20;cxEditorsRS19;dxSkinMcSkinRS19;FireDACInfxDriver;JvDocking;adortl;dxSkinOffice2007SilverRS19;frxDB20;JvWizards;FireDACASADriver;dxSkinSevenRS19;JvHMI;dxDBXServerModeRS19;dxLayoutControlRS19;dxPSTeeChartRS19;dxSkinWhiteprintRS19;cxPageControlRS19;fsADO20;JvBands;ZDbc;rtl;dcldxSkinsCoreRS19;DbxClientDriver;ZPlain;dxPScxGridLnkRS19;Tee;cxPageControldxBarPopupMenuRS19;cxVerticalGridRS19;JclContainers;CPortLibDXE;JvSystem;DataSnapNativeClient;svnui;dxSkinsdxRibbonPainterRS19;dxSkinSummer2008RS19;cxPivotGridRS19;dxComnRS19;IndyProtocols;DBXMySQLDriver;dxSkinTheAsphaltWorldRS19;JvControls;tmsxlsdXE5;dxPSLnksRS19;viTimeLineDPK;bindcompdbx;TeeUI;JvJans;JvPrintPreview;JvPageComps;dxSkinDarkRoomRS19;JvStdCtrls;JvCustom;dxSkinPumpkinRS19;dxBarExtItemsRS19;FireDACADSDriver;vcltouch;ZCore;dxNavBarRS19;VclSmp;FireDAC;VCLRESTComponents;dxGDIPlusRS19;DataSnapConnectors;dxCoreRS19;dxPScxVGridLnkRS19;fsDB20;dxPScxTLLnkRS19;dxSkinsCoreRS19;fmxobj;dxSkinGlassOceansRS19;JclVcl;ZParseSql;dxPScxPCProdRS19;fs20;svn;tmsexdXE5;dxSkinOffice2010BlueRS19;FireDACOracleDriver;fmxdae;dxorgcRS19;bdertl;cxTreeListRS19;FireDACMSAccDriver;DataSnapIndy10ServerTransport;dxSkinDevExpressStyleRS19;dxSkinCaramelRS19;$(DCC_UsePackage) @@ -94,13 +93,11 @@ true - ..\..\..\bin\x86 true 1033 false - ..\..\..\bin\x64 true 1033 @@ -111,12 +108,10 @@ 0 - ..\..\..\bin\x86 true 1033 - ..\..\..\bin\x64 true 1033 diff --git a/samples/MultiDemo/Augmented reality/simplAR.dproj b/samples/MultiDemo/Augmented reality/simplAR.dproj index 47bf333..9d2af8a 100644 --- a/samples/MultiDemo/Augmented reality/simplAR.dproj +++ b/samples/MultiDemo/Augmented reality/simplAR.dproj @@ -35,9 +35,10 @@ true + .\$(Platform)\$(Config) simplAR false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) None 00400000 System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) diff --git a/samples/MultiDemo/CameraCalibrate/CameraCalibrate.dproj b/samples/MultiDemo/CameraCalibrate/CameraCalibrate.dproj index 2e9c011..89958f3 100644 --- a/samples/MultiDemo/CameraCalibrate/CameraCalibrate.dproj +++ b/samples/MultiDemo/CameraCalibrate/CameraCalibrate.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) CameraCalibrate false false @@ -43,7 +44,7 @@ 00400000 false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1049 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= diff --git a/samples/MultiDemo/CameraCaptureFindContours/CameraCaptureAndFindContours.dproj b/samples/MultiDemo/CameraCaptureFindContours/CameraCaptureAndFindContours.dproj index d0b8343..52009f3 100644 --- a/samples/MultiDemo/CameraCaptureFindContours/CameraCaptureAndFindContours.dproj +++ b/samples/MultiDemo/CameraCaptureFindContours/CameraCaptureAndFindContours.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) CameraCaptureAndFindContours false false @@ -43,7 +44,7 @@ 00400000 false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1049 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= diff --git a/samples/MultiDemo/CameraShift/CameraShift.dproj b/samples/MultiDemo/CameraShift/CameraShift.dproj index 4438834..2b293a5 100644 --- a/samples/MultiDemo/CameraShift/CameraShift.dproj +++ b/samples/MultiDemo/CameraShift/CameraShift.dproj @@ -35,10 +35,11 @@ true + .\$(Platform)\$(Config) CameraShift false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/MultiDemo/CarNumDetect/CarNumDetect.dproj b/samples/MultiDemo/CarNumDetect/CarNumDetect.dproj index eb88e35..d824fa3 100644 --- a/samples/MultiDemo/CarNumDetect/CarNumDetect.dproj +++ b/samples/MultiDemo/CarNumDetect/CarNumDetect.dproj @@ -41,6 +41,7 @@ true + .\$(Platform)\$(Config) CarNumDetect false false diff --git a/samples/MultiDemo/FaceDetect/FaceDetect.dproj b/samples/MultiDemo/FaceDetect/FaceDetect.dproj index da16516..a098459 100644 --- a/samples/MultiDemo/FaceDetect/FaceDetect.dproj +++ b/samples/MultiDemo/FaceDetect/FaceDetect.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) FaceDetect None 00400000 @@ -42,7 +43,7 @@ 1049 false System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - ..\..\..\bin + ..\..\..\bin\$(Platform) 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= false false diff --git a/samples/MultiDemo/FaceDetect/FaceDetect2.dproj b/samples/MultiDemo/FaceDetect/FaceDetect2.dproj index 9aad401..4272f8e 100644 --- a/samples/MultiDemo/FaceDetect/FaceDetect2.dproj +++ b/samples/MultiDemo/FaceDetect/FaceDetect2.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) FaceDetect2 None 00400000 @@ -42,7 +43,7 @@ 1049 false System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - ..\..\..\bin + ..\..\..\bin\$(Platform) 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= false false diff --git a/samples/MultiDemo/FaceDetectAndLockWorkstation/LockWorkstation.dproj b/samples/MultiDemo/FaceDetectAndLockWorkstation/LockWorkstation.dproj index a5fdc50..491091b 100644 --- a/samples/MultiDemo/FaceDetectAndLockWorkstation/LockWorkstation.dproj +++ b/samples/MultiDemo/FaceDetectAndLockWorkstation/LockWorkstation.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) LockWorkstation false 00400000 @@ -81,7 +82,7 @@ 1033 true LockWorkstation_Icon.ico - ..\..\..\bin + ..\..\..\bin\$(Platform) CompanyName=Mikhail Grigorev;FileDescription=LockWorkstation;FileVersion=1.0.0.1;InternalName=LockWorkstation;LegalCopyright=Mikhail Grigorev;LegalTrademarks=Mikhail Grigorev;OriginalFilename=LockWorkstation;ProductName=LockWorkstation;ProductVersion=1.0.0.0;Comments=www.im-history.ru diff --git a/samples/MultiDemo/FrameRecon/FrameRecon.dproj b/samples/MultiDemo/FrameRecon/FrameRecon.dproj index 1638f20..3ffe3d8 100644 --- a/samples/MultiDemo/FrameRecon/FrameRecon.dproj +++ b/samples/MultiDemo/FrameRecon/FrameRecon.dproj @@ -35,12 +35,13 @@ true + .\$(Platform)\$(Config) FrameRecon false false false None - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false 00400000 System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) diff --git a/samples/MultiDemo/HandsDetect/HandsDetect.dproj b/samples/MultiDemo/HandsDetect/HandsDetect.dproj index fe2bfb5..961eb72 100644 --- a/samples/MultiDemo/HandsDetect/HandsDetect.dproj +++ b/samples/MultiDemo/HandsDetect/HandsDetect.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) HandsDetect System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) false @@ -65,7 +66,7 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= None - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1033 diff --git a/samples/MultiDemo/Hello World/HelloWorld.dproj b/samples/MultiDemo/Hello World/HelloWorld.dproj index 2126c27..bbf7266 100644 --- a/samples/MultiDemo/Hello World/HelloWorld.dproj +++ b/samples/MultiDemo/Hello World/HelloWorld.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) HelloWorld false false @@ -43,7 +44,7 @@ 00400000 false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1049 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= diff --git a/samples/MultiDemo/IPCamVideoCapture/IPCamVideoCapture.dproj b/samples/MultiDemo/IPCamVideoCapture/IPCamVideoCapture.dproj index d066003..0020faa 100644 --- a/samples/MultiDemo/IPCamVideoCapture/IPCamVideoCapture.dproj +++ b/samples/MultiDemo/IPCamVideoCapture/IPCamVideoCapture.dproj @@ -35,8 +35,9 @@ true + .\$(Platform)\$(Config) IPCamVideoCapture - ..\..\..\bin\ + ..\..\..\bin\$(Platform) None false false diff --git a/samples/MultiDemo/MotionDetect/MotionDetect.dproj b/samples/MultiDemo/MotionDetect/MotionDetect.dproj index 109dfad..68282ce 100644 --- a/samples/MultiDemo/MotionDetect/MotionDetect.dproj +++ b/samples/MultiDemo/MotionDetect/MotionDetect.dproj @@ -41,6 +41,7 @@ true + .\$(Platform)\$(Config) MotionDetect 1049 false diff --git a/samples/MultiDemo/ObjectTracking/ObjectTrack.dproj b/samples/MultiDemo/ObjectTracking/ObjectTrack.dproj index 462ba48..eece59a 100644 --- a/samples/MultiDemo/ObjectTracking/ObjectTrack.dproj +++ b/samples/MultiDemo/ObjectTracking/ObjectTrack.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) ObjectTrack false 00400000 @@ -51,7 +52,7 @@ None 1033 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - ..\..\..\bin + ..\..\..\bin\$(Platform) RELEASE;$(DCC_Define) diff --git a/samples/MultiDemo/Squares/Squares.dproj b/samples/MultiDemo/Squares/Squares.dproj index aa5c17a..a0eafd6 100644 --- a/samples/MultiDemo/Squares/Squares.dproj +++ b/samples/MultiDemo/Squares/Squares.dproj @@ -35,10 +35,11 @@ true + .\$(Platform)\$(Config) Squares false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/MultiDemo/Stereo/Stereo.dproj b/samples/MultiDemo/Stereo/Stereo.dproj index 28a12fd..b0db036 100644 --- a/samples/MultiDemo/Stereo/Stereo.dproj +++ b/samples/MultiDemo/Stereo/Stereo.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) Stereo false false @@ -43,7 +44,7 @@ 00400000 false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1049 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= diff --git a/samples/MultiDemo/TrackColor/TrackColor.dproj b/samples/MultiDemo/TrackColor/TrackColor.dproj index 66b02dc..554e2a5 100644 --- a/samples/MultiDemo/TrackColor/TrackColor.dproj +++ b/samples/MultiDemo/TrackColor/TrackColor.dproj @@ -35,10 +35,11 @@ true + .\$(Platform)\$(Config) TrackColor false 1049 - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/MultiDemo/TwoCameras/TwoCameras_C.dproj b/samples/MultiDemo/TwoCameras/TwoCameras_C.dproj index 13ef899..d2b0358 100644 --- a/samples/MultiDemo/TwoCameras/TwoCameras_C.dproj +++ b/samples/MultiDemo/TwoCameras/TwoCameras_C.dproj @@ -35,8 +35,9 @@ true + .\$(Platform)\$(Config) TwoCameras_C - ..\..\..\bin\ + ..\..\..\bin\$(Platform) None 00400000 System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) diff --git a/samples/MultiDemo/TwoCameras/TwoCameras_C_Thread.dproj b/samples/MultiDemo/TwoCameras/TwoCameras_C_Thread.dproj index 22a3d21..94775b4 100644 --- a/samples/MultiDemo/TwoCameras/TwoCameras_C_Thread.dproj +++ b/samples/MultiDemo/TwoCameras/TwoCameras_C_Thread.dproj @@ -35,8 +35,9 @@ true + .\$(Platform)\$(Config) TwoCameras_C_Thread - ..\..\..\bin\ + ..\..\..\bin\$(Platform) None false false diff --git a/samples/MultiDemo/VideoProcessing/VideoProcessing.dproj b/samples/MultiDemo/VideoProcessing/VideoProcessing.dproj index db20855..ba9cff0 100644 --- a/samples/MultiDemo/VideoProcessing/VideoProcessing.dproj +++ b/samples/MultiDemo/VideoProcessing/VideoProcessing.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) VideoProcessing false false @@ -43,7 +44,7 @@ 00400000 false false - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 1049 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= diff --git a/samples/MultiDemo/fback/fback_c.dproj b/samples/MultiDemo/fback/fback_c.dproj index 918e33e..b344afe 100644 --- a/samples/MultiDemo/fback/fback_c.dproj +++ b/samples/MultiDemo/fback/fback_c.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) fback_c 00400000 System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) @@ -44,7 +45,7 @@ None 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= - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false 1049 diff --git a/samples/MultiDemo/minarea/minarea.dproj b/samples/MultiDemo/minarea/minarea.dproj index 6c6ee55..05ff6d1 100644 --- a/samples/MultiDemo/minarea/minarea.dproj +++ b/samples/MultiDemo/minarea/minarea.dproj @@ -35,6 +35,7 @@ true + .\$(Platform)\$(Config) minarea 00400000 System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) @@ -44,7 +45,7 @@ None 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= - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false 1049 diff --git a/samples/MultiDemo/mmdt/mmdt.dproj b/samples/MultiDemo/mmdt/mmdt.dproj index 2f1c7ba..b057a49 100644 --- a/samples/MultiDemo/mmdt/mmdt.dproj +++ b/samples/MultiDemo/mmdt/mmdt.dproj @@ -35,9 +35,10 @@ true + .\$(Platform)\$(Config) mmdt System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace) - ..\..\..\bin\ + ..\..\..\bin\$(Platform) 00400000 false None diff --git a/samples/VCLDemo/vclCameraCapture/VCLCameraCapture.dproj b/samples/VCLDemo/vclCameraCapture/VCLCameraCapture.dproj index dd1cf7b..d222de0 100644 --- a/samples/VCLDemo/vclCameraCapture/VCLCameraCapture.dproj +++ b/samples/VCLDemo/vclCameraCapture/VCLCameraCapture.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) VCLCameraCapture None $(BDS)\bin\delphi_PROJECTICON.ico @@ -47,7 +48,7 @@ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= .\$(Platform)\$(Config) - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/VCLDemo/vclChessboardCorners/VCLChessboardCorners.dproj b/samples/VCLDemo/vclChessboardCorners/VCLChessboardCorners.dproj index 70c603d..d7f89d3 100644 --- a/samples/VCLDemo/vclChessboardCorners/VCLChessboardCorners.dproj +++ b/samples/VCLDemo/vclChessboardCorners/VCLChessboardCorners.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) VCLChessboardCorners $(BDS)\bin\delphi_PROJECTICON.ico System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) @@ -75,7 +76,7 @@ true true 1033 - ..\..\..\bin + ..\..\..\bin\$(Platform) false diff --git a/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj b/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj index 39c7d50..4a6db10 100644 --- a/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj +++ b/samples/VCLDemo/vclColorTracking/vclColorTracking.dproj @@ -46,6 +46,7 @@ true + .\$(Platform)\$(Config) vclColorTracking None $(BDS)\bin\delphi_PROJECTICON.ico @@ -53,7 +54,7 @@ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= .\$(Platform)\$(Config) - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj index 6160ebf..7b174f8 100644 --- a/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj +++ b/samples/VCLDemo/vclColorTracking2/vclColorTracking2.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) vclColorTracking2 1049 false @@ -58,7 +59,7 @@ $(BDS)\bin\default_app.manifest 1033 CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - ..\..\..\bin\ + ..\..\..\bin\$(Platform) vclColorTracking2_Icon.ico diff --git a/samples/VCLDemo/vclIPCameraCapture/VCLIPCameraCapture.dproj b/samples/VCLDemo/vclIPCameraCapture/VCLIPCameraCapture.dproj index 054a809..a73a1b6 100644 --- a/samples/VCLDemo/vclIPCameraCapture/VCLIPCameraCapture.dproj +++ b/samples/VCLDemo/vclIPCameraCapture/VCLIPCameraCapture.dproj @@ -46,6 +46,7 @@ true + .\$(Platform)\$(Config) VCLIPCameraCapture None $(BDS)\bin\delphi_PROJECTICON.ico @@ -53,7 +54,7 @@ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= .\$(Platform)\$(Config) - ..\..\..\bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj index cdddded..33869b4 100644 --- a/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj +++ b/samples/VCLDemo/vclOpenCVandOpenGL/vclOCVaOGL.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) vclOCVaOGL CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= 1049 @@ -47,7 +48,7 @@ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) None .\$(Platform)\$(Config) - ..\..\..\Bin + ..\..\..\bin\$(Platform) false false false diff --git a/samples/VCLDemo/vclPCArecognition/vclPCArecognition.dproj b/samples/VCLDemo/vclPCArecognition/vclPCArecognition.dproj index 8b9548c..c770bae 100644 --- a/samples/VCLDemo/vclPCArecognition/vclPCArecognition.dproj +++ b/samples/VCLDemo/vclPCArecognition/vclPCArecognition.dproj @@ -40,6 +40,7 @@ true + .\$(Platform)\$(Config) vclPCArecognition $(BDS)\bin\delphi_PROJECTICON.ico 1049 @@ -47,7 +48,7 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace) .\$(Platform)\$(Config) - ..\..\..\Bin\ + ..\..\..\bin\$(Platform) false false false diff --git a/source/component/uOCVView.pas b/source/component/uOCVView.pas index 6b5074d..66c2b75 100644 --- a/source/component/uOCVView.pas +++ b/source/component/uOCVView.pas @@ -22,30 +22,28 @@ // **************************************************************** {$IFNDEF CLR} - {$I OpenCV.inc} - unit uOCVView; {$ENDIF} interface uses - {$IFDEF VER6P} +{$IFDEF VER6P} WinApi.Windows, WinApi.Messages, System.SysUtils, System.Classes, Vcl.Controls, Vcl.Graphics, - {$ELSE} +{$ELSE} Windows, Messages, SysUtils, Classes, Controls, Graphics, - {$ENDIF VER6P} +{$ENDIF VER6P} uOCVTypes, core.types_c; @@ -156,6 +154,7 @@ procedure TocvView.WMPaint(var Message: TWMPaint); Var DC: HDC; lpPaint: TPaintStruct; + // CRect: TRect; begin if (csDesigning in ComponentState) or (not isSourceEnabled) then inherited @@ -165,16 +164,16 @@ begin begin Canvas.Lock; DC := BeginPaint(Handle, lpPaint); + // WinApi.Windows.GetClientRect(Handle, CRect); try Canvas.Handle := DC; try if Assigned(OnBeforePaint) then OnBeforePaint(Self, FImage); - ipDraw(DC, FImage.IpImage, ClientRect); - - if Assigned(OnAfterPaint) then - OnAfterPaint(Self, FImage); + if ipDraw(DC, FImage.IpImage, ClientRect) then + if Assigned(OnAfterPaint) then + OnAfterPaint(Self, FImage); finally Canvas.Handle := 0; diff --git a/source/include/cvUtils.pas b/source/include/cvUtils.pas index ca6f61f..f7a3991 100644 --- a/source/include/cvUtils.pas +++ b/source/include/cvUtils.pas @@ -338,11 +338,14 @@ Var _dibhdr: TBitmapInfo ABSOLUTE buf; _rgb: pCOLORREF; i: Integer; + iResult: Integer; begin if (not Assigned(img)) or (not Assigned(img^.imageData)) then Exit(false); + isrgb := ('R' = upcase(img^.colorModel[0])) and ('G' = upcase(img^.colorModel[1])) and ('B' = upcase(img^.colorModel[2])); isgray := 'G' = upcase(img^.colorModel[0]); + if (not isgray) and (not isrgb) then Exit(false); if (1 = img^.nChannels) and (not isgray) then @@ -354,6 +357,7 @@ begin if (isgray) then for i := 0 to 255 do _rgb[i] := rgb(i, i, i); + dibhdr^.biSize := SizeOf(BITMAPINFOHEADER); dibhdr^.biWidth := img^.Width; // Check origin for display @@ -374,14 +378,19 @@ begin if Stretch then begin SetStretchBltMode(dc, COLORONCOLOR); + SetMapMode(dc, MM_TEXT); // Stretch the image to fit the rectangle - Result := StretchDIBits(dc, rect.left, rect.top, rect.Width, rect.Height, 0, 0, img^.Width, img^.Height, img^.imageData, - _dibhdr, DIB_RGB_COLORS, SRCCOPY) > 0; + iResult := StretchDIBits(dc, rect.left, rect.top, rect.Width, rect.Height, 0, 0, img^.Width, img^.Height, img^.imageData, + _dibhdr, DIB_RGB_COLORS, SRCCOPY); + Result := (iResult > 0) and (iResult <> GDI_ERROR); end else + begin // Draw without scaling - Result := SetDIBitsToDevice(dc, rect.left, rect.top, img^.Width, img^.Height, 0, 0, 0, img^.Height, img^.imageData, _dibhdr, - DIB_RGB_COLORS) > 0; + iResult := SetDIBitsToDevice(dc, rect.left, rect.top, img^.Width, img^.Height, 0, 0, 0, img^.Height, img^.imageData, _dibhdr, + DIB_RGB_COLORS); + Result := (iResult > 0) and (iResult <> GDI_ERROR); + end; end; end.