Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correct signature for FindHomography #1254

Merged
merged 2 commits into from
Nov 25, 2024
Merged

fix: correct signature for FindHomography #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fff316
fix: correct signature for FindHomography, since dst is actually targ…
deadprogram Nov 24, 2024
dcda1ca
build: fix for homebrew pkg-config conflict
deadprogram Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build:
strategy:
matrix:
os: [macos-13, macos-14]
os: [macos-14]
runs-on: ${{ matrix.os }}
steps:
- name: Install OpenCV
Expand All @@ -19,6 +19,7 @@ jobs:
rm /usr/local/bin/idle3*
rm /usr/local/bin/pydoc*
rm /usr/local/bin/python3*
brew unlink [email protected]
brew install opencv
- name: Install Go
uses: actions/setup-go@v5
Expand Down
4 changes: 2 additions & 2 deletions imgproc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,8 +1839,8 @@ const (
//
// For further details, please see:
// https://docs.opencv.org/master/d9/d0c/group__calib3d.html#ga4abc2ece9fab9398f2e560d53c8c9780
func FindHomography(srcPoints Mat, dstPoints *Mat, method HomographyMethod, ransacReprojThreshold float64, mask *Mat, maxIters int, confidence float64) Mat {
return newMat(C.FindHomography(srcPoints.Ptr(), dstPoints.Ptr(), C.int(method), C.double(ransacReprojThreshold), mask.Ptr(), C.int(maxIters), C.double(confidence)))
func FindHomography(srcPoints Mat, targetPoints Mat, method HomographyMethod, ransacReprojThreshold float64, mask *Mat, maxIters int, confidence float64) Mat {
return newMat(C.FindHomography(srcPoints.Ptr(), targetPoints.Ptr(), C.int(method), C.double(ransacReprojThreshold), mask.Ptr(), C.int(maxIters), C.double(confidence)))
}

// DrawContours draws contours outlines or filled contours.
Expand Down
16 changes: 8 additions & 8 deletions imgproc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,16 +2079,16 @@ func TestGetAffineTransform2f(t *testing.T) {
func TestFindHomography(t *testing.T) {
src := NewMatWithSize(4, 1, MatTypeCV64FC2)
defer src.Close()
dst := NewMatWithSize(4, 1, MatTypeCV64FC2)
defer dst.Close()
target := NewMatWithSize(4, 1, MatTypeCV64FC2)
defer target.Close()

srcPoints := []Point2f{
{193, 932},
{191, 378},
{1497, 183},
{1889, 681},
}
dstPoints := []Point2f{
targetPoints := []Point2f{
{51.51206544281359, -0.10425475260813055},
{51.51211051314331, -0.10437947532732306},
{51.512222354139325, -0.10437679311830816},
Expand All @@ -2100,21 +2100,21 @@ func TestFindHomography(t *testing.T) {
src.SetDoubleAt(i, 1, float64(point.Y))
}

for i, point := range dstPoints {
dst.SetDoubleAt(i, 0, float64(point.X))
dst.SetDoubleAt(i, 1, float64(point.Y))
for i, point := range targetPoints {
target.SetDoubleAt(i, 0, float64(point.X))
target.SetDoubleAt(i, 1, float64(point.Y))
}

mask := NewMat()
defer mask.Close()

m := FindHomography(src, &dst, HomographyMethodAllPoints, 3, &mask, 2000, 0.995)
m := FindHomography(src, target, HomographyMethodAllPoints, 3, &mask, 2000, 0.995)
defer m.Close()

pvsrc := NewPoint2fVectorFromPoints(srcPoints)
defer pvsrc.Close()

pvdst := NewPoint2fVectorFromPoints(dstPoints)
pvdst := NewPoint2fVectorFromPoints(targetPoints)
defer pvdst.Close()

m2 := GetPerspectiveTransform2f(pvsrc, pvdst)
Expand Down
Loading