Skip to content

Commit

Permalink
Merge pull request #47 from JuliaImages/vs/update
Browse files Browse the repository at this point in the history
Bump package version, CXXWrap, and some small fixes
  • Loading branch information
ViralBShah authored Oct 24, 2024
2 parents e3e1dae + 93b50a2 commit cfdadf0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/UnitTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.6'
- '1.10'
- '1'
os:
- ubuntu-latest
Expand Down Expand Up @@ -62,3 +62,4 @@ jobs:
- uses: codecov/codecov-action@v4
with:
files: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name = "OpenCV"
uuid = "f878e3a2-a245-4720-8660-60795d644f2a"
authors = ["Archit Rungta <[email protected]>"]
version = "4.5.3"
version = "4.6.0"

[deps]
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
OpenCV_jll = "33b9d88c-85f9-5d73-bd91-4e2b95a9aa0b"

[compat]
CxxWrap = "0.11, 0.12, 0.13"
julia = "^1.6.0"
CxxWrap = "0.16"
julia = "1.10"
6 changes: 3 additions & 3 deletions test/Artifacts.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[opencv_extra]
git-tree-sha1 = "6d7d3f9fcc70a7a13e6617cea255f143df9957db"
git-tree-sha1 = "41248814be0db6d9ae939420e33d320fe5c859b8"
lazy = true

[[opencv_extra.download]]
sha256 = "f1aff8497dbb84088b505c7dbda66480ac94ff2cae1b1db7f30c49781035b427"
url = "https://github.com/opencv/opencv_extra/archive/refs/tags/4.5.3.tar.gz"
sha256 = "21867d1f2469bac6f11f81ba292789bd61cdc46e18205f67803dfe28b7803609"
url = "https://github.com/opencv/opencv_extra/archive/refs/tags/4.10.0.tar.gz"
2 changes: 1 addition & 1 deletion test/test_dnn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ size0 = 300

# cv.dnn.setPreferableTarget(net, cv.dnn.DNN_TARGET_CPU)
cv.dnn.setInputMean(net, (104, 177, 123))
cv.dnn.setInputScale(net, 1.)
cv.dnn.setInputScale(net, (1.,))
cv.dnn.setInputSize(net, size0, size0)


Expand Down
2 changes: 1 addition & 1 deletion test/test_feature2d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ for kp in kps
end
end

@test_skip closest_match < 10 # TODO This test fails intermittently
@test closest_match < 10 # TODO This test fails intermittently
end

0 comments on commit cfdadf0

Please sign in to comment.