Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix scanner orientation and crop dimensions

laurenspriem96111afef939
diff --git a/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart b/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart
index fdf16d8405..579d2ecec3 100644
--- a/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart
+++ b/mobile/apps/locker/lib/services/scanner/rust_document_scanner_service.dart
@@ -16,7 +16,6 @@ class RustDocumentScannerService implements DocumentScannerService {
Directory? _dir;
ScannerSession? _session;
Future<void>? _initialization;
- final Map<String, ({int width, int height})> _sourceDims = {};
int _counter = 0;
DateTime _lastLiveLog = DateTime.fromMillisecondsSinceEpoch(0);
@@ -153,10 +152,6 @@ class RustDocumentScannerService implements DocumentScannerService {
final processed = File(p.join(_root.path, '${id}_r0.jpg'));
await source.writeAsBytes(capturedJpeg, flush: true);
await processed.writeAsBytes(result.processedImage, flush: true);
- _sourceDims[id] = (
- width: result.sourceWidth,
- height: result.sourceHeight,
- );
final quad = result.quad;
return ScannedPage(
id: id,
@@ -171,6 +166,8 @@ class RustDocumentScannerService implements DocumentScannerService {
),
rotationDegrees: 0,
resolvedColorMode: _colorModeFromRust(result.colorMode),
+ sourceWidth: result.sourceWidth,
+ sourceHeight: result.sourceHeight,
width: result.outputWidth,
height: result.outputHeight,
);
@@ -187,15 +184,15 @@ class RustDocumentScannerService implements DocumentScannerService {
int? rotationDegrees,
}) async {
try {
- final dims = _sourceDims[page.id];
- if (dims == null) {
- throw StateError('Unknown page ${page.id}');
- }
final sourceBytes = await page.sourceJpeg.readAsBytes();
final result = await _readySession.reprocess(
sourceBytes: sourceBytes,
options: RustReprocessOptions(
- quad: _sourceQuadFromMask(quad ?? page.quad, dims.width, dims.height),
+ quad: _sourceQuadFromMask(
+ quad ?? page.quad,
+ page.sourceWidth,
+ page.sourceHeight,
+ ),
rotationDegrees: rotationDegrees ?? page.rotationDegrees,
colorMode: _colorModeToRust(page.resolvedColorMode),
maxPixels: _maxPixels,
@@ -223,7 +220,6 @@ class RustDocumentScannerService implements DocumentScannerService {
@override
Future<void> disposePage(ScannedPage page) async {
- _sourceDims.remove(page.id);
await _deleteIfExists(page.sourceJpeg);
await _deleteIfExists(page.processedJpeg);
}
@@ -233,7 +229,6 @@ class RustDocumentScannerService implements DocumentScannerService {
_session?.dispose();
_session = null;
_initialization = null;
- _sourceDims.clear();
_dir = null;
}
diff --git a/mobile/apps/locker/lib/services/scanner/scanner_models.dart b/mobile/apps/locker/lib/services/scanner/scanner_models.dart
index 1bc3ae21db..405574322e 100644
--- a/mobile/apps/locker/lib/services/scanner/scanner_models.dart
+++ b/mobile/apps/locker/lib/services/scanner/scanner_models.dart
@@ -26,6 +26,8 @@ class ScannedPage {
required this.quad,
required this.rotationDegrees,
required this.resolvedColorMode,
+ required this.sourceWidth,
+ required this.sourceHeight,
required this.width,
required this.height,
});
@@ -42,6 +44,9 @@ class ScannedPage {
final ScanColorMode resolvedColorMode;
+ final int sourceWidth;
+ final int sourceHeight;
+
final int width;
final int height;
@@ -59,6 +64,8 @@ class ScannedPage {
quad: quad ?? this.quad,
rotationDegrees: rotationDegrees ?? this.rotationDegrees,
resolvedColorMode: resolvedColorMode ?? this.resolvedColorMode,
+ sourceWidth: sourceWidth,
+ sourceHeight: sourceHeight,
width: width ?? this.width,
height: height ?? this.height,
);
diff --git a/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart b/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart
index 1e1f98a38f..4dfa0af67e 100644
--- a/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart
+++ b/mobile/apps/locker/lib/ui/pages/scanner/scanner_capture_page.dart
@@ -187,7 +187,9 @@ class _ScannerCapturePageState extends State<ScannerCapturePage>
Future<void> _analyze(CameraImage image) async {
try {
- final rotation = _camera?.description.sensorOrientation ?? 0;
+ final rotation = Platform.isIOS
+ ? 0
+ : _camera?.description.sensorOrientation ?? 0;
ScanQuad? raw;
if (image.planes.length >= 3) {
raw = await _session.detectLiveYuv(
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 2f32bcc69d..261ed6537d 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
@@ -4,7 +4,6 @@ import 'package:ente_components/ente_components.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:flutter/material.dart';
import 'package:hugeicons/hugeicons.dart';
-import 'package:locker/services/scanner/pdf_writer.dart';
import 'package:locker/services/scanner/scan_geometry.dart';
import 'package:locker/services/scanner/scan_session_controller.dart';
import 'package:locker/services/scanner/scanner_models.dart';
@@ -45,16 +44,9 @@ class _ScannerCropPageState extends State<ScannerCropPage> {
}
final bytes = await page.sourceJpeg.readAsBytes();
if (!mounted) return;
- double aspect;
- try {
- final info = JpegInfo.parse(bytes);
- aspect = info.width / info.height;
- } on FormatException {
- aspect = page.width / page.height;
- }
setState(() {
_sourceBytes = bytes;
- _aspect = aspect;
+ _aspect = page.sourceWidth / page.sourceHeight;
_corners = [
for (final c in page.quad.corners)
Offset(c.dx / ScanQuad.maskSide, c.dy / ScanQuad.maskSide),