diff --git a/Cargo.toml b/Cargo.toml index 26cb0f8..18db2c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ version = "23" optional = true [dependencies.opencv] -version = "0.94" +version = "0.95" default-features = false optional = true diff --git a/examples/decoder_test/Cargo.toml b/examples/decoder_test/Cargo.toml index f9edeb1..ef0c0c3 100644 --- a/examples/decoder_test/Cargo.toml +++ b/examples/decoder_test/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -image = "0.24.5" +image = "0.25" [dependencies.nokhwa-core] path = "../../nokhwa-core" diff --git a/nokhwa-bindings-windows/Cargo.toml b/nokhwa-bindings-windows/Cargo.toml index 3ff0424..ea9598f 100644 --- a/nokhwa-bindings-windows/Cargo.toml +++ b/nokhwa-bindings-windows/Cargo.toml @@ -14,17 +14,15 @@ keywords = ["media-foundation", "windows", "capture", "webcam"] docs-only = [] [dependencies] +once_cell = "1" [dependencies.nokhwa-core] version = "0.1" path = "../nokhwa-core" [target.'cfg(target_os="windows")'.dependencies.windows] -version = "0.43" +version = "0.61" features = ["Win32_Media_MediaFoundation", "Win32_System_Com", "Win32_Foundation", "Win32_Media_DirectShow", "Win32_Media", "Win32", "Win32_Media_KernelStreaming"] -[target.'cfg(target_os="windows")'.dependencies.once_cell] -version = "1.16" - [package.metadata.docs.rs] features = ["docs-only"] diff --git a/nokhwa-bindings-windows/src/lib.rs b/nokhwa-bindings-windows/src/lib.rs index 83f0483..8b3edb0 100644 --- a/nokhwa-bindings-windows/src/lib.rs +++ b/nokhwa-bindings-windows/src/lib.rs @@ -175,7 +175,7 @@ pub mod wmf { pub fn initialize_mf() -> Result<(), NokhwaError> { if !(INITIALIZED.load(Ordering::SeqCst)) { if let Err(why) = unsafe { - CoInitializeEx(None, CO_INIT_APARTMENT_THREADED | CO_INIT_DISABLE_OLE1DDE) + CoInitializeEx(None, CO_INIT_APARTMENT_THREADED | CO_INIT_DISABLE_OLE1DDE).ok() } { return Err(NokhwaError::InitializeError { backend: ApiBackend::MediaFoundation, diff --git a/nokhwa-core/Cargo.toml b/nokhwa-core/Cargo.toml index 19d78e0..f78654e 100644 --- a/nokhwa-core/Cargo.toml +++ b/nokhwa-core/Cargo.toml @@ -37,7 +37,7 @@ version = "23" optional = true [dependencies.opencv] -version = "0.94" +version = "0.95" optional = true [dependencies.bytemuck]