Browse Source

Revert trim clamping

pull/137/head
Andrea Ciliberti 1 year ago
parent
commit
3e2861323f
  1. 20
      ctru-rs/src/services/cam.rs

20
ctru-rs/src/services/cam.rs

@ -669,26 +669,22 @@ pub trait Camera: private::ConfigurableCamera {
/// Set trimming bounds to trim the camera photo. /// Set trimming bounds to trim the camera photo.
/// ///
/// # Notes /// # Panics
/// ///
/// Setting up a [`Trimming`] configurations that exceeds the bounds of the original /// Setting up a [`Trimming`] configurations that exceeds the bounds of the original
/// image's size will result in the trimming to be clamped to the maximum borders of the image. /// image's size will result in a panic.
/// Also, the final image size must have a pixel area multiple of 128,
/// otherwise the "status_changed" error may be returned.
#[doc(alias = "CAMU_SetTrimming")] #[doc(alias = "CAMU_SetTrimming")]
fn set_trimming(&mut self, trimming: Trimming) -> crate::Result<()> { fn set_trimming(&mut self, trimming: Trimming) -> crate::Result<()> {
match trimming { match trimming {
Trimming::Centered { width, height } => unsafe { Trimming::Centered { width, height } => unsafe {
let view_size: (i16, i16) = self.view_size().into(); let view_size: (i16, i16) = self.view_size().into();
let mut trim_size: (i16, i16) = (width, height); let trim_size: (i16, i16) = (width, height);
if trim_size.0 > view_size.0 { // Check whether the trim size is within the view.
trim_size.0 = view_size.0; assert!(
}; trim_size.0 <= view_size.0 && trim_size.1 <= view_size.1,
"trimmed view is bigger than the camera view",
if trim_size.1 > view_size.1 { );
trim_size.1 = view_size.1;
};
ResultCode(ctru_sys::CAMU_SetTrimming(self.port_as_raw(), true))?; ResultCode(ctru_sys::CAMU_SetTrimming(self.port_as_raw(), true))?;

Loading…
Cancel
Save