Merge remote-tracking branch 'origin/0.10' into 0.10

# Conflicts:
#	Cargo.toml
This commit is contained in:
l1npengtul
2023-05-14 18:39:12 +09:00
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -33,7 +33,7 @@ features = ["derive"]
optional = true
[dependencies.wgpu]
version = "0.14"
version = "0.15"
optional = true
[dependencies.opencv]
+1
View File
@@ -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()) {