Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[rust][mobile][locker] Stop degenerate crops from reaching the pipeline

laurenspriem7073168961f7
diff --git a/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart b/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
index 0c33987b93..9c323a0d0a 100644
--- a/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
+++ b/mobile/apps/locker/lib/services/scanner/auto_capture_controller.dart
@@ -1,3 +1,4 @@
+import 'package:locker/services/scanner/scan_geometry.dart';
import 'package:locker/services/scanner/scanner_models.dart';
enum AutoCaptureState { searching, arming, cooldown }
@@ -85,13 +86,6 @@ class AutoCaptureController {
_lastFrameAt = null;
}
- static double _areaFraction(ScanQuad quad) {
- var doubled = 0.0;
- for (var i = 0; i < 4; i++) {
- final a = quad.corners[i];
- final b = quad.corners[(i + 1) % 4];
- doubled += a.dx * b.dy - b.dx * a.dy;
- }
- return doubled.abs() / 2 / (ScanQuad.maskSide * ScanQuad.maskSide);
- }
+ static double _areaFraction(ScanQuad quad) =>
+ quadArea(quad.corners) / (ScanQuad.maskSide * ScanQuad.maskSide);
}
diff --git a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart b/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
index 7a8e952c20..f52986a3d5 100644
--- a/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
+++ b/mobile/apps/locker/lib/services/scanner/scan_geometry.dart
@@ -16,6 +16,16 @@ double maxCornerDistance(ScanQuad a, ScanQuad b) {
return worst;
}
+double quadArea(List<Offset> corners) {
+ var doubled = 0.0;
+ for (var i = 0; i < corners.length; i++) {
+ final a = corners[i];
+ final b = corners[(i + 1) % corners.length];
+ doubled += a.dx * b.dy - b.dx * a.dy;
+ }
+ return doubled.abs() / 2;
+}
+
ScanQuad orderClockwise(List<Offset> corners) {
assert(corners.length == 4);
final cx = corners.map((c) => c.dx).reduce((a, b) => a + b) / 4;
diff --git a/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart b/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
index 261ed6537d..fd4bdd4139 100644
--- a/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/scanner/scanner_crop_page.dart
@@ -25,6 +25,10 @@ class ScannerCropPage extends StatefulWidget {
class _ScannerCropPageState extends State<ScannerCropPage> {
static const double _handleRadius = 22;
+ /// A crop smaller than this cannot be a document, and the pipeline cannot
+ /// produce a usable page from it.
+ static const double _minAreaFraction = 0.01;
+
Uint8List? _sourceBytes;
double _aspect = 3 / 4;
List<Offset> _corners = const [];
@@ -61,12 +65,20 @@ class _ScannerCropPageState extends State<ScannerCropPage> {
return null;
}
+ ScanQuad get _orderedQuad => orderClockwise([
+ for (final c in _corners)
+ Offset(c.dx * ScanQuad.maskSide, c.dy * ScanQuad.maskSide),
+ ]);
+
+ bool get _canSave =>
+ _corners.length == 4 &&
+ quadArea(_orderedQuad.corners) /
+ (ScanQuad.maskSide * ScanQuad.maskSide) >=
+ _minAreaFraction;
+
Future<void> _save() async {
final navigator = Navigator.of(context);
- final quad = orderClockwise([
- for (final c in _corners)
- Offset(c.dx * ScanQuad.maskSide, c.dy * ScanQuad.maskSide),
- ]);
+ final quad = _orderedQuad;
await widget.session.updatePage(widget.pageId, quad: quad);
if (mounted) navigator.pop();
}
@@ -197,7 +209,7 @@ class _ScannerCropPageState extends State<ScannerCropPage> {
padding: const EdgeInsets.all(Spacing.xl),
child: ButtonComponent(
label: context.strings.save,
- onTap: source == null ? null : _save,
+ onTap: source == null || !_canSave ? null : _save,
),
),
],
diff --git a/rust/crates/ml/src/scan/postprocess.rs b/rust/crates/ml/src/scan/postprocess.rs
index 6cb4997209..faa85d9649 100644
--- a/rust/crates/ml/src/scan/postprocess.rs
+++ b/rust/crates/ml/src/scan/postprocess.rs
@@ -183,8 +183,8 @@ fn enhance_grayscale_image(img: &ImageU8) -> OpResult<ImageU8> {
let mut retinex = ImageF32::zeros(gray.width, gray.height, 1)?;
for kernel_size in kernel_sizes {
- let (kw, kh) = size_trunc(kernel_size, kernel_size);
- let blur_raw = cv::box_filter_f32(&img_float, kw, kh)?;
+ let k = (kernel_size as i32).max(3) | 1;
+ let blur_raw = cv::box_filter_f32(&img_float, k, k)?;
let blur = cv::add_f32_scalar(&blur_raw, 1.0)?;
let log_blur = cv::log_f32(&blur)?;
let diff = cv::subtract_f32(&log_img, &log_blur)?;