From 0d0957cea5b451e9b89a0d719f3d247017d581b3 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Mon, 26 Dec 2022 17:44:29 +0800 Subject: [PATCH] remove u128 compare --- libs/scrap/src/common/android.rs | 2 +- libs/scrap/src/common/mod.rs | 4 ++-- libs/scrap/src/common/quartz.rs | 2 +- libs/scrap/src/dxgi/mod.rs | 2 +- libs/scrap/src/wayland/pipewire.rs | 2 +- libs/scrap/src/x11/capturer.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/scrap/src/common/android.rs b/libs/scrap/src/common/android.rs index 949188712..8daf8e4bb 100644 --- a/libs/scrap/src/common/android.rs +++ b/libs/scrap/src/common/android.rs @@ -13,7 +13,7 @@ lazy_static! { pub struct Capturer { display: Display, bgra: Vec, - saved_raw_data: Vec, // for faster compare and copy + saved_raw_data: Vec, // for faster compare and copy } impl Capturer { diff --git a/libs/scrap/src/common/mod.rs b/libs/scrap/src/common/mod.rs index 82f65537b..0e2f998df 100644 --- a/libs/scrap/src/common/mod.rs +++ b/libs/scrap/src/common/mod.rs @@ -44,8 +44,8 @@ pub mod record; mod vpx; #[inline] -pub fn would_block_if_equal(old: &mut Vec, b: &[u8]) -> std::io::Result<()> { - let b = unsafe { std::slice::from_raw_parts::(b.as_ptr() as _, b.len() / 16) }; +pub fn would_block_if_equal(old: &mut Vec, b: &[u8]) -> std::io::Result<()> { + // does this really help? if b == &old[..] { return Err(std::io::ErrorKind::WouldBlock.into()); } diff --git a/libs/scrap/src/common/quartz.rs b/libs/scrap/src/common/quartz.rs index 6e29c2441..a02d55ebb 100644 --- a/libs/scrap/src/common/quartz.rs +++ b/libs/scrap/src/common/quartz.rs @@ -8,7 +8,7 @@ pub struct Capturer { frame: Arc>>, use_yuv: bool, i420: Vec, - saved_raw_data: Vec, // for faster compare and copy + saved_raw_data: Vec, // for faster compare and copy } impl Capturer { diff --git a/libs/scrap/src/dxgi/mod.rs b/libs/scrap/src/dxgi/mod.rs index 6b60b256d..5829686b5 100644 --- a/libs/scrap/src/dxgi/mod.rs +++ b/libs/scrap/src/dxgi/mod.rs @@ -50,7 +50,7 @@ pub struct Capturer { rotated: Vec, gdi_capturer: Option, gdi_buffer: Vec, - saved_raw_data: Vec, // for faster compare and copy + saved_raw_data: Vec, // for faster compare and copy } impl Capturer { diff --git a/libs/scrap/src/wayland/pipewire.rs b/libs/scrap/src/wayland/pipewire.rs index abbdf3f25..c1c84f98e 100644 --- a/libs/scrap/src/wayland/pipewire.rs +++ b/libs/scrap/src/wayland/pipewire.rs @@ -123,7 +123,7 @@ pub struct PipeWireRecorder { appsink: AppSink, width: usize, height: usize, - saved_raw_data: Vec, // for faster compare and copy + saved_raw_data: Vec, // for faster compare and copy } impl PipeWireRecorder { diff --git a/libs/scrap/src/x11/capturer.rs b/libs/scrap/src/x11/capturer.rs index ed424c35a..0dcfcfdab 100644 --- a/libs/scrap/src/x11/capturer.rs +++ b/libs/scrap/src/x11/capturer.rs @@ -14,7 +14,7 @@ pub struct Capturer { size: usize, use_yuv: bool, yuv: Vec, - saved_raw_data: Vec, // for faster compare and copy + saved_raw_data: Vec, // for faster compare and copy } impl Capturer {