From e33a248d3070c6e7c106543344c597c6ae8bf46f Mon Sep 17 00:00:00 2001 From: bortyr Date: Thu, 25 Jan 2024 00:13:06 +0100 Subject: [PATCH 1/3] Bump opencv to 0.88 --- cv-convert-generate/packages.toml | 2 +- cv-convert/Cargo.toml | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cv-convert-generate/packages.toml b/cv-convert-generate/packages.toml index 17513c3..c098048 100644 --- a/cv-convert-generate/packages.toml +++ b/cv-convert-generate/packages.toml @@ -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"] diff --git a/cv-convert/Cargo.toml b/cv-convert/Cargo.toml index 900b4ec..df83417 100644 --- a/cv-convert/Cargo.toml +++ b/cv-convert/Cargo.toml @@ -17,7 +17,7 @@ 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', @@ -25,7 +25,7 @@ default = [ docs-only = [ 'image_0-24', 'imageproc_0-23', - 'opencv_0-85', + 'opencv_0-88', 'tch_0-14', 'nalgebra_0-32', 'ndarray_0-15', @@ -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' From 802f71b880275d584ba9515f2b59c0bee6fc886a Mon Sep 17 00:00:00 2001 From: bortyr Date: Thu, 25 Jan 2024 00:28:06 +0100 Subject: [PATCH 2/3] Add snipplets for opencv 0.88 --- cv-convert/generated/Cargo.toml.snipplet | 7 +++++++ cv-convert/generated/lib.rs.snipplet | 2 +- cv-convert/generated/macros.rs.snipplet | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cv-convert/generated/Cargo.toml.snipplet b/cv-convert/generated/Cargo.toml.snipplet index 2cf07ea..68d219b 100644 --- a/cv-convert/generated/Cargo.toml.snipplet +++ b/cv-convert/generated/Cargo.toml.snipplet @@ -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' diff --git a/cv-convert/generated/lib.rs.snipplet b/cv-convert/generated/lib.rs.snipplet index f9191c9..f1067ef 100644 --- a/cv-convert/generated/lib.rs.snipplet +++ b/cv-convert/generated/lib.rs.snipplet @@ -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 ; \ No newline at end of file +# [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 ; \ No newline at end of file diff --git a/cv-convert/generated/macros.rs.snipplet b/cv-convert/generated/macros.rs.snipplet index e5b6cb7..4114996 100644 --- a/cv-convert/generated/macros.rs.snipplet +++ b/cv-convert/generated/macros.rs.snipplet @@ -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 ; \ No newline at end of file +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 ; \ No newline at end of file From cf380900d5f4358457a943ef757e7262f5e61d61 Mon Sep 17 00:00:00 2001 From: bortyr Date: Thu, 25 Jan 2024 00:31:10 +0100 Subject: [PATCH 3/3] Update README regarding opencv 0.88 --- cv-convert/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cv-convert/README.md b/cv-convert/README.md index f491a9b..3a7f7dc 100644 --- a/cv-convert/README.md +++ b/cv-convert/README.md @@ -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', @@ -41,6 +41,8 @@ const-generics. ### opencv +- `opencv_0-88` +- `opencv_0-85` - `opencv_0-84` - `opencv_0-83` - `opencv_0-82`