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.

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

Bump opencv to 0.88 #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cv-convert-generate/packages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use_default_features = true
features = []

[package.opencv]
versions = ["0.63", "0.64", "0.65", "0.66", "0.67", "0.68", "0.69", "0.70", "0.71", "0.72", "0.73", "0.74", "0.75", "0.76", "0.77", "0.78", "0.79", "0.80", "0.81", "0.82", "0.83", "0.84", "0.85"]
versions = ["0.63", "0.64", "0.65", "0.66", "0.67", "0.68", "0.69", "0.70", "0.71", "0.72", "0.73", "0.74", "0.75", "0.76", "0.77", "0.78", "0.79", "0.80", "0.81", "0.82", "0.83", "0.84", "0.85", "0.88"]
use_default_features = false
features = ["calib3d"]

Expand Down
11 changes: 9 additions & 2 deletions cv-convert/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ features = ['docs-only']
default = [
'image_0-24',
'imageproc_0-23',
'opencv_0-85',
'opencv_0-88',
'tch_0-14',
'nalgebra_0-32',
'ndarray_0-15',
]
docs-only = [
'image_0-24',
'imageproc_0-23',
'opencv_0-85',
'opencv_0-88',
'tch_0-14',
'nalgebra_0-32',
'ndarray_0-15',
Expand Down Expand Up @@ -268,6 +268,13 @@ default-features = false
features = ['calib3d']
optional = true

[dependencies.opencv_0-88]
version = '0.88'
package = 'opencv'
default-features = false
features = ['calib3d']
optional = true

[dependencies.ndarray_0-15]
version = '0.15'
package = 'ndarray'
Expand Down
4 changes: 3 additions & 1 deletion cv-convert/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ version = 'x.y.z' # Please look up the recent version on crates.io
default-features = false
features = [
'image_0-24',
'opencv_0-84',
'opencv_0-88',
'tch_0-13',
'nalgebra_0-32',
'ndarray_0-15',
Expand All @@ -41,6 +41,8 @@ const-generics.

### opencv

- `opencv_0-88`
- `opencv_0-85`
- `opencv_0-84`
- `opencv_0-83`
- `opencv_0-82`
Expand Down
7 changes: 7 additions & 0 deletions cv-convert/generated/Cargo.toml.snipplet
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,13 @@ default-features = false
features = ['calib3d']
optional = true

[dependencies.opencv_0-88]
version = '0.88'
package = 'opencv'
default-features = false
features = ['calib3d']
optional = true

[dependencies.ndarray_0-15]
version = '0.15'
package = 'ndarray'
Expand Down
2 changes: 1 addition & 1 deletion cv-convert/generated/lib.rs.snipplet
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# [cfg (feature = "image_0-23")] pub use image_0_23 as image ; # [cfg (feature = "image_0-24")] pub use image_0_24 as image ; # [cfg (feature = "nalgebra_0-26")] pub use nalgebra_0_26 as nalgebra ; # [cfg (feature = "nalgebra_0-27")] pub use nalgebra_0_27 as nalgebra ; # [cfg (feature = "nalgebra_0-28")] pub use nalgebra_0_28 as nalgebra ; # [cfg (feature = "nalgebra_0-29")] pub use nalgebra_0_29 as nalgebra ; # [cfg (feature = "nalgebra_0-30")] pub use nalgebra_0_30 as nalgebra ; # [cfg (feature = "nalgebra_0-31")] pub use nalgebra_0_31 as nalgebra ; # [cfg (feature = "nalgebra_0-32")] pub use nalgebra_0_32 as nalgebra ; # [cfg (feature = "opencv_0-63")] pub use opencv_0_63 as opencv ; # [cfg (feature = "opencv_0-64")] pub use opencv_0_64 as opencv ; # [cfg (feature = "opencv_0-65")] pub use opencv_0_65 as opencv ; # [cfg (feature = "opencv_0-66")] pub use opencv_0_66 as opencv ; # [cfg (feature = "opencv_0-67")] pub use opencv_0_67 as opencv ; # [cfg (feature = "opencv_0-68")] pub use opencv_0_68 as opencv ; # [cfg (feature = "opencv_0-69")] pub use opencv_0_69 as opencv ; # [cfg (feature = "opencv_0-70")] pub use opencv_0_70 as opencv ; # [cfg (feature = "opencv_0-71")] pub use opencv_0_71 as opencv ; # [cfg (feature = "opencv_0-72")] pub use opencv_0_72 as opencv ; # [cfg (feature = "opencv_0-73")] pub use opencv_0_73 as opencv ; # [cfg (feature = "opencv_0-74")] pub use opencv_0_74 as opencv ; # [cfg (feature = "opencv_0-75")] pub use opencv_0_75 as opencv ; # [cfg (feature = "opencv_0-76")] pub use opencv_0_76 as opencv ; # [cfg (feature = "opencv_0-77")] pub use opencv_0_77 as opencv ; # [cfg (feature = "opencv_0-78")] pub use opencv_0_78 as opencv ; # [cfg (feature = "opencv_0-79")] pub use opencv_0_79 as opencv ; # [cfg (feature = "opencv_0-80")] pub use opencv_0_80 as opencv ; # [cfg (feature = "opencv_0-81")] pub use opencv_0_81 as opencv ; # [cfg (feature = "opencv_0-82")] pub use opencv_0_82 as opencv ; # [cfg (feature = "opencv_0-83")] pub use opencv_0_83 as opencv ; # [cfg (feature = "opencv_0-84")] pub use opencv_0_84 as opencv ; # [cfg (feature = "opencv_0-85")] pub use opencv_0_85 as opencv ; # [cfg (feature = "ndarray_0-15")] pub use ndarray_0_15 as ndarray ; # [cfg (feature = "tch_0-14")] pub use tch_0_14 as tch ; # [cfg (feature = "imageproc_0-23")] pub use imageproc_0_23 as imageproc ;
# [cfg (feature = "image_0-23")] pub use image_0_23 as image ; # [cfg (feature = "image_0-24")] pub use image_0_24 as image ; # [cfg (feature = "nalgebra_0-26")] pub use nalgebra_0_26 as nalgebra ; # [cfg (feature = "nalgebra_0-27")] pub use nalgebra_0_27 as nalgebra ; # [cfg (feature = "nalgebra_0-28")] pub use nalgebra_0_28 as nalgebra ; # [cfg (feature = "nalgebra_0-29")] pub use nalgebra_0_29 as nalgebra ; # [cfg (feature = "nalgebra_0-30")] pub use nalgebra_0_30 as nalgebra ; # [cfg (feature = "nalgebra_0-31")] pub use nalgebra_0_31 as nalgebra ; # [cfg (feature = "nalgebra_0-32")] pub use nalgebra_0_32 as nalgebra ; # [cfg (feature = "opencv_0-63")] pub use opencv_0_63 as opencv ; # [cfg (feature = "opencv_0-64")] pub use opencv_0_64 as opencv ; # [cfg (feature = "opencv_0-65")] pub use opencv_0_65 as opencv ; # [cfg (feature = "opencv_0-66")] pub use opencv_0_66 as opencv ; # [cfg (feature = "opencv_0-67")] pub use opencv_0_67 as opencv ; # [cfg (feature = "opencv_0-68")] pub use opencv_0_68 as opencv ; # [cfg (feature = "opencv_0-69")] pub use opencv_0_69 as opencv ; # [cfg (feature = "opencv_0-70")] pub use opencv_0_70 as opencv ; # [cfg (feature = "opencv_0-71")] pub use opencv_0_71 as opencv ; # [cfg (feature = "opencv_0-72")] pub use opencv_0_72 as opencv ; # [cfg (feature = "opencv_0-73")] pub use opencv_0_73 as opencv ; # [cfg (feature = "opencv_0-74")] pub use opencv_0_74 as opencv ; # [cfg (feature = "opencv_0-75")] pub use opencv_0_75 as opencv ; # [cfg (feature = "opencv_0-76")] pub use opencv_0_76 as opencv ; # [cfg (feature = "opencv_0-77")] pub use opencv_0_77 as opencv ; # [cfg (feature = "opencv_0-78")] pub use opencv_0_78 as opencv ; # [cfg (feature = "opencv_0-79")] pub use opencv_0_79 as opencv ; # [cfg (feature = "opencv_0-80")] pub use opencv_0_80 as opencv ; # [cfg (feature = "opencv_0-81")] pub use opencv_0_81 as opencv ; # [cfg (feature = "opencv_0-82")] pub use opencv_0_82 as opencv ; # [cfg (feature = "opencv_0-83")] pub use opencv_0_83 as opencv ; # [cfg (feature = "opencv_0-84")] pub use opencv_0_84 as opencv ; # [cfg (feature = "opencv_0-85")] pub use opencv_0_85 as opencv ; # [cfg (feature = "opencv_0-88")] pub use opencv_0_88 as opencv ; # [cfg (feature = "ndarray_0-15")] pub use ndarray_0_15 as ndarray ; # [cfg (feature = "tch_0-14")] pub use tch_0_14 as tch ; # [cfg (feature = "imageproc_0-23")] pub use imageproc_0_23 as imageproc ;
2 changes: 1 addition & 1 deletion cv-convert/generated/macros.rs.snipplet
Original file line number Diff line number Diff line change
@@ -1 +1 @@
macro_rules ! if_image { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "image_0-23" , feature = "image_0-24"))] $ item) * } ; } pub (crate) use if_image ; macro_rules ! has_image { ($ ($ item : item) *) => { crate :: macros :: if_image ! { # [allow (unused_imports)] use crate :: image as _ ; $ ($ item) * } } } pub (crate) use has_image ; macro_rules ! if_nalgebra { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "nalgebra_0-26" , feature = "nalgebra_0-27" , feature = "nalgebra_0-28" , feature = "nalgebra_0-29" , feature = "nalgebra_0-30" , feature = "nalgebra_0-31" , feature = "nalgebra_0-32"))] $ item) * } ; } pub (crate) use if_nalgebra ; macro_rules ! has_nalgebra { ($ ($ item : item) *) => { crate :: macros :: if_nalgebra ! { # [allow (unused_imports)] use crate :: nalgebra as _ ; $ ($ item) * } } } pub (crate) use has_nalgebra ; macro_rules ! if_opencv { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "opencv_0-63" , feature = "opencv_0-64" , feature = "opencv_0-65" , feature = "opencv_0-66" , feature = "opencv_0-67" , feature = "opencv_0-68" , feature = "opencv_0-69" , feature = "opencv_0-70" , feature = "opencv_0-71" , feature = "opencv_0-72" , feature = "opencv_0-73" , feature = "opencv_0-74" , feature = "opencv_0-75" , feature = "opencv_0-76" , feature = "opencv_0-77" , feature = "opencv_0-78" , feature = "opencv_0-79" , feature = "opencv_0-80" , feature = "opencv_0-81" , feature = "opencv_0-82" , feature = "opencv_0-83" , feature = "opencv_0-84" , feature = "opencv_0-85"))] $ item) * } ; } pub (crate) use if_opencv ; macro_rules ! has_opencv { ($ ($ item : item) *) => { crate :: macros :: if_opencv ! { # [allow (unused_imports)] use crate :: opencv as _ ; $ ($ item) * } } } pub (crate) use has_opencv ; macro_rules ! if_ndarray { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "ndarray_0-15"))] $ item) * } ; } pub (crate) use if_ndarray ; macro_rules ! has_ndarray { ($ ($ item : item) *) => { crate :: macros :: if_ndarray ! { # [allow (unused_imports)] use crate :: ndarray as _ ; $ ($ item) * } } } pub (crate) use has_ndarray ; macro_rules ! if_tch { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "tch_0-14"))] $ item) * } ; } pub (crate) use if_tch ; macro_rules ! has_tch { ($ ($ item : item) *) => { crate :: macros :: if_tch ! { # [allow (unused_imports)] use crate :: tch as _ ; $ ($ item) * } } } pub (crate) use has_tch ; macro_rules ! if_imageproc { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "imageproc_0-23"))] $ item) * } ; } pub (crate) use if_imageproc ; macro_rules ! has_imageproc { ($ ($ item : item) *) => { crate :: macros :: if_imageproc ! { # [allow (unused_imports)] use crate :: imageproc as _ ; $ ($ item) * } } } pub (crate) use has_imageproc ;
macro_rules ! if_image { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "image_0-23" , feature = "image_0-24"))] $ item) * } ; } pub (crate) use if_image ; macro_rules ! has_image { ($ ($ item : item) *) => { crate :: macros :: if_image ! { # [allow (unused_imports)] use crate :: image as _ ; $ ($ item) * } } } pub (crate) use has_image ; macro_rules ! if_nalgebra { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "nalgebra_0-26" , feature = "nalgebra_0-27" , feature = "nalgebra_0-28" , feature = "nalgebra_0-29" , feature = "nalgebra_0-30" , feature = "nalgebra_0-31" , feature = "nalgebra_0-32"))] $ item) * } ; } pub (crate) use if_nalgebra ; macro_rules ! has_nalgebra { ($ ($ item : item) *) => { crate :: macros :: if_nalgebra ! { # [allow (unused_imports)] use crate :: nalgebra as _ ; $ ($ item) * } } } pub (crate) use has_nalgebra ; macro_rules ! if_opencv { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "opencv_0-63" , feature = "opencv_0-64" , feature = "opencv_0-65" , feature = "opencv_0-66" , feature = "opencv_0-67" , feature = "opencv_0-68" , feature = "opencv_0-69" , feature = "opencv_0-70" , feature = "opencv_0-71" , feature = "opencv_0-72" , feature = "opencv_0-73" , feature = "opencv_0-74" , feature = "opencv_0-75" , feature = "opencv_0-76" , feature = "opencv_0-77" , feature = "opencv_0-78" , feature = "opencv_0-79" , feature = "opencv_0-80" , feature = "opencv_0-81" , feature = "opencv_0-82" , feature = "opencv_0-83" , feature = "opencv_0-84" , feature = "opencv_0-85" , feature = "opencv_0-88"))] $ item) * } ; } pub (crate) use if_opencv ; macro_rules ! has_opencv { ($ ($ item : item) *) => { crate :: macros :: if_opencv ! { # [allow (unused_imports)] use crate :: opencv as _ ; $ ($ item) * } } } pub (crate) use has_opencv ; macro_rules ! if_ndarray { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "ndarray_0-15"))] $ item) * } ; } pub (crate) use if_ndarray ; macro_rules ! has_ndarray { ($ ($ item : item) *) => { crate :: macros :: if_ndarray ! { # [allow (unused_imports)] use crate :: ndarray as _ ; $ ($ item) * } } } pub (crate) use has_ndarray ; macro_rules ! if_tch { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "tch_0-14"))] $ item) * } ; } pub (crate) use if_tch ; macro_rules ! has_tch { ($ ($ item : item) *) => { crate :: macros :: if_tch ! { # [allow (unused_imports)] use crate :: tch as _ ; $ ($ item) * } } } pub (crate) use has_tch ; macro_rules ! if_imageproc { ($ ($ item : item) *) => { $ (# [cfg (any (feature = "imageproc_0-23"))] $ item) * } ; } pub (crate) use if_imageproc ; macro_rules ! has_imageproc { ($ ($ item : item) *) => { crate :: macros :: if_imageproc ! { # [allow (unused_imports)] use crate :: imageproc as _ ; $ ($ item) * } } } pub (crate) use has_imageproc ;