diff --git a/include/calib3d/calib3d_c.pas b/include/calib3d/calib3d_c.pas index 90b19a9..b7e97e1 100644 --- a/include/calib3d/calib3d_c.pas +++ b/include/calib3d/calib3d_c.pas @@ -267,15 +267,16 @@ procedure cvFindExtrinsicCameraParams2(const object_points: pCvMat; const image_ // #define CV_CALIB_CB_FILTER_QUADS 4 // #define CV_CALIB_CB_FAST_CHECK 8 // -/// / Performs a fast check if a chessboard is in the input image. This is a workaround to -/// / a problem of cvFindChessboardCorners being slow on images with no chessboard -/// / - src: input image -/// / - size: chessboard size -/// / Returns 1 if a chessboard can be in this image and findChessboardCorners should be called, -/// / 0 if there is no chessboard, -1 in case of error -// CVAPI(int) cvCheckChessboard(IplImage* src, CvSize size); -function cvCheckChessboard(const image: Pointer; size: TCvSize): Integer; cdecl; +{// Performs a fast check if a chessboard is in the input image. This is a workaround to + // a problem of cvFindChessboardCorners being slow on images with no chessboard + // - src: input image + // - size: chessboard size + // Returns 1 if a chessboard can be in this image and findChessboardCorners should be called, + // 0 if there is no chessboard, -1 in case of error + CVAPI(int) cvCheckChessboard(IplImage* src, CvSize size); +} +function cvCheckChessboard(const image: pCvArr; size: TCvSize): Integer; cdecl; // /* Detects corners on a chessboard calibration pattern */ diff --git a/samples/MultiDemo/VCLChessboardCorners/MainForm.dfm b/samples/MultiDemo/VCLChessboardCorners/MainForm.dfm index 9468917..adf5ced 100644 --- a/samples/MultiDemo/VCLChessboardCorners/MainForm.dfm +++ b/samples/MultiDemo/VCLChessboardCorners/MainForm.dfm @@ -3,7 +3,7 @@ object FormMain: TFormMain Top = 154 Caption = 'Chessboard Corners' ClientHeight = 484 - ClientWidth = 1368 + ClientWidth = 1284 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText diff --git a/samples/MultiDemo/VCLChessboardCorners/MainForm.pas b/samples/MultiDemo/VCLChessboardCorners/MainForm.pas index af14065..e0e6866 100644 --- a/samples/MultiDemo/VCLChessboardCorners/MainForm.pas +++ b/samples/MultiDemo/VCLChessboardCorners/MainForm.pas @@ -1,11 +1,27 @@ -(* / ************************************************************************************************** - // Print the Calibration_Chess.png file present in Delphi-OpenCV\Bin\Resource. - // Then keep it in front on camera... +(* /***************************************************************** + // Delphi-OpenCV Demo + // Copyright (C) 2013 Project Delphi-OpenCV + // **************************************************************** + // Contributor: + // Samuele Trentin + // **************************************************************** + // You may retrieve the latest version of this file at the GitHub, + // located at git://github.com/Laex/Delphi-OpenCV.git + // **************************************************************** + // The contents of this file are used with permission, subject to + // the Mozilla Public License Version 1.1 (the "License"); you may + // not use this file except in compliance with the License. You may + // obtain a copy of the License at + // http://www.mozilla.org/MPL/MPL-1_1Final.html // - // Note: cvFindChessboardCorners - // ************************************************************************************************** *) - - + // Software distributed under the License is distributed on an + // "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + // implied. See the License for the specific language governing + // rights and limitations under the License. + ******************************************************************* *) +// JCL_DEBUG_EXPERT_GENERATEJDBG OFF +// JCL_DEBUG_EXPERT_INSERTJDBG OFF +// JCL_DEBUG_EXPERT_DELETEMAPFILE OFF unit MainForm; interface diff --git a/samples/MultiDemo/VCLChessboardCorners/VCLChessboardCorners.dproj b/samples/MultiDemo/VCLChessboardCorners/VCLChessboardCorners.dproj index 94ff782..5a05e83 100644 --- a/samples/MultiDemo/VCLChessboardCorners/VCLChessboardCorners.dproj +++ b/samples/MultiDemo/VCLChessboardCorners/VCLChessboardCorners.dproj @@ -74,7 +74,7 @@ true true 1033 - C:\Delphi\Delphi-OpenCV\Bin\ + ..\..\..\bin false @@ -153,8 +153,8 @@ VCLChessboardCorners.dpr - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components