mirror of
https://github.com/l1npengtul/nokhwa.git
synced 2026-07-13 21:48:53 +00:00
Merge remote-tracking branch 'origin/0.10' into 0.10
# Conflicts: # Cargo.toml
This commit is contained in:
+1
-1
@@ -87,7 +87,7 @@ path = "nokhwa-bindings-windows"
|
||||
optional = true
|
||||
|
||||
[dependencies.nokhwa-bindings-macos]
|
||||
version = "0.2.1"
|
||||
version = "0.2.0"
|
||||
path = "nokhwa-bindings-macos"
|
||||
optional = true
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ features = ["derive"]
|
||||
optional = true
|
||||
|
||||
[dependencies.wgpu]
|
||||
version = "0.14"
|
||||
version = "0.15"
|
||||
optional = true
|
||||
|
||||
[dependencies.opencv]
|
||||
|
||||
@@ -210,6 +210,7 @@ pub trait CaptureBackendTrait {
|
||||
dimension: TextureDimension::D2,
|
||||
format: TextureFormat::Rgba8UnormSrgb,
|
||||
usage: TextureUsages::TEXTURE_BINDING | TextureUsages::COPY_DST,
|
||||
view_formats: &[],
|
||||
});
|
||||
|
||||
let width_nonzero = match NonZeroU32::try_from(4 * frame.width()) {
|
||||
|
||||
Reference in New Issue
Block a user