1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Merge pull request #28804 from asmorkalov:as/calib_boards_migration

Migrated chessboard and circles grid detectors to objdetect #28804
  
OpenCV Contrib: https://github.com/opencv/opencv_contrib/pull/4125
OpenCV Extra: https://github.com/opencv/opencv_extra/pull/1375

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Alexander Smorkalov
2026-05-27 16:06:51 +03:00
committed by GitHub
parent dafe7cef97
commit e19b0ebc5c
41 changed files with 880 additions and 456 deletions
@@ -15,6 +15,7 @@ import org.opencv.core.Point;
import org.opencv.core.Scalar;
import org.opencv.core.Size;
import org.opencv.imgproc.Imgproc;
import org.opencv.objdetect.Objdetect;
import android.util.Log;
@@ -124,8 +125,8 @@ public class CameraCalibrator {
}
private void findPattern(Mat grayFrame) {
mPatternWasFound = Calib.findCirclesGrid(grayFrame, mPatternSize,
mCorners, Calib.CALIB_CB_ASYMMETRIC_GRID);
mPatternWasFound = Objdetect.findCirclesGrid(grayFrame, mPatternSize,
mCorners, Objdetect.CALIB_CB_ASYMMETRIC_GRID);
}
public void addCorners() {
@@ -135,7 +136,7 @@ public class CameraCalibrator {
}
private void drawPoints(Mat rgbaFrame) {
Calib.drawChessboardCorners(rgbaFrame, mPatternSize, mCorners, mPatternWasFound);
Objdetect.drawChessboardCorners(rgbaFrame, mPatternSize, mCorners, mPatternWasFound);
}
private void renderFrame(Mat rgbaFrame) {