mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-10-26 02:58:32 -06:00
* M10: enhance camera images: straighten a page from four corners (ocr.camera-perspective) Four corners on a page (any order, a convex quadrilateral) are warped to an upright rectangle that replaces what the page shows, read at the page picture's own resolution (at most 600 dpi) and kept at that physical size. One undoable step through Replace Pages, so comments, links and bookmarks stay. - geom: a pure 3x3 homography solve and corner ordering (no dependencies); collinear, concave and non-finite input gives None. - engine: camera::warp (bilinear, over white, capped at 40 MP) and Session::enhance_camera_page. - automation: page_enhance_camera (corners in top-left-origin points). - parity: ocr.camera-perspective is partial; the UI handles, automatic edge detection and contrast cleanup are still missing. Refs #1008. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M10: Enhance camera image: drag four corners on the page, then Enhance page (ocr.camera-perspective) Scan & OCR ▸ Enhance camera image (ocr.enhance_camera) shows four corner handles on the current page, inset 5% from its edges, with what will be cut away dimmed. Enhance page straightens what they enclose through Session::enhance_camera_page (one undoable step); Cancel and Esc leave the page alone. The buttons float at the top right, clear of a centred page's corners, and the instructions are a notice, as for Crop. A command of its own, beside Enhance scanned file (ocr.enhance), which stays for scan correction (#1012). - ui-egui: camera_ui (handles, dimming, bar), QuickTool::EnhanceCamera, quick_tool "enhance-camera" for ui.state and the shot example. - Catalogs: the three new labels in every language with UI coverage (plus es, pl, zh-hant); ATTRIBUTION.toml hashes updated. - automation: page_enhance_camera is linked to the command. - parity: ocr.camera-perspective lists the command and the UI test. Refs #1008. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M10: Enhance camera image finds the document's edges (ocr.camera-perspective) The corners now start on the photographed document's edges when they can be found, else inset 5% as before. camera_edges::detect_document, pure Rust and deterministic: shrink to 400 px, blur, Sobel edges thinned and thresholded against the 98th percentile; a Hough transform where each edge votes within 6 degrees of its own normal; pairs of near-horizontal and near-vertical lines make convex quadrilaterals (at least 12% of the picture), kept when every side lies on a matching edge along at least 55% of its length and scored by area times the square of the mean support; each side is then refitted through its edge points (total least squares). None when nothing convinces. - Session::detect_camera_corners (user space); page_enhance_camera finds the corners itself when `corners` is omitted and reports the corners it used and whether they were detected; the UI command starts from them. - Tests on synthetic photos: plain table, text on the sheet, wood grain with a shadow, strong perspective, a 30 degree turn, a sheet running off the picture, no document, white on white, bad input; end to end through the engine and the tool. - Parity notes: what is still missing (turning the result upright, rounded corners, clean-up). Refs #1008. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M10: after Enhance page, rotate, crop or organize the page (ocr.camera-perspective) Enhance camera image no longer closes on Enhance page: the bar then offers rotate counterclockwise and clockwise for the enhanced page (one undo step each), Crop pages and Organize pages (which leave the tool for those tools), and Done; Esc leaves too. A photo of a card often comes out a quarter turn off until the page is turned upright automatically. The two icon buttons are named for screen readers. Every label already exists in the catalogs. Refs #1008. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M10: Enhance camera image cleans the photo up and chooses its look (#1034) After Enhance page the bar offers a look (Original, Colour, Greyscale, Black and white) and a Clean-up slider (0-100, default Colour at 50). Choosing a look or letting go of the slider enhances the page again from the straightened photo and turns it as before, so the history keeps one enhancement (and one turn), never a pile of them. camera_clean, pure Rust: - clean: the paper's illumination is estimated per channel on a coarse grid (each block's 90th percentile, lifted to the 75th percentile of the 5x5 blocks around it so a stamp or picture isn't taken for paper, then smoothed) and divided out, so casts, shadows and darker edges go and the paper turns white; a contrast stretch grows with the level, and from 60 isolated dark pixels are removed. Colour ink stays. - apply(look): Original is the photo as taken; Greyscale is the cleaned page in grey; Black and white evens the lighting fully, thresholds the whole page (the level sets the threshold: higher keeps fainter strokes) and despeckles. Black and white is stored as PNG (lossless): JPEG would smear grey around every letter. - Session::enhance_camera_page_at(look, level); page_enhance_camera takes `mode` (original, colour, greyscale, bw) and `level` (0-100), refusing anything else. - "Clean-up", "Original", "Greyscale" and "Black and white" in every catalog with UI coverage, plus es, pl and zh-hant. - Tests: shadow and yellow cast become white paper with dark text, a blue stamp stays blue, strength grows with the level, specks go but text stays, the four looks (black and white is only black and white, the threshold moves with the level), bad sizes; a shadowed sheet through the engine; level and mode through the tool; the slider and the looks re-enhancing from the photo and keeping the turn. - Parity: ocr.background-removal, ocr.edge-shadow-removal and ocr.despeckle are partial (camera images only). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * M10: Enhance camera image cleans the photo up and chooses its look (#1034) After Enhance page the bar offers a look (Original, Colour, Greyscale, Black and white) and a Clean-up slider (0-100, default Colour at 50). Choosing a look or letting go of the slider enhances the page again from the straightened photo and turns it as before, so the history keeps one enhancement (and one turn), never a pile of them. camera_clean, pure Rust: - clean: the paper's illumination is estimated per channel on a coarse grid (each block's 90th percentile, lifted to the 75th percentile of the 5x5 blocks around it so a stamp or picture isn't taken for paper, then smoothed) and divided out, so casts, shadows and darker edges go and the paper turns white; a contrast stretch grows with the level, and from 60 isolated dark pixels are removed. Colour ink stays. - apply(look): Original is the photo as taken; Greyscale is the cleaned page in grey; Black and white evens the lighting fully, thresholds the whole page (the level sets the threshold: higher keeps fainter strokes) and despeckles. Black and white is stored as PNG (lossless): JPEG would smear grey around every letter. - Session::enhance_camera_page_at(look, level); page_enhance_camera takes `mode` (original, colour, greyscale, bw) and `level` (0-100), refusing anything else. - "Clean-up", "Original", "Greyscale" and "Black and white" in every catalog with UI coverage, plus es, pl and zh-hant. - Tests: shadow and yellow cast become white paper with dark text, a blue stamp stays blue, strength grows with the level, specks go but text stays, the four looks (black and white is only black and white, the threshold moves with the level), bad sizes; a shadowed sheet through the engine; level and mode through the tool; the slider and the looks re-enhancing from the photo and keeping the turn. - Parity: ocr.background-removal, ocr.edge-shadow-removal and ocr.despeckle are partial (camera images only). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Camera level: when another edit broke the run, redo what was undone instead of warping the page again --------- Co-authored-by: magdale76 <16279778+magdale76@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Brandon Thomas <echelon@gmail.com>
281 lines
14 KiB
Rust
281 lines
14 KiB
Rust
//! Scan & OCR ▸ Enhance ▸ Camera image: straighten a photographed document. Four corners on the
|
||
//! page (PDF user space) are warped to a rectangle, and the page's content becomes that picture
|
||
//! (one undoable step, through Replace Pages, so the page's comments, links and bookmarks stay).
|
||
|
||
use std::sync::Arc;
|
||
|
||
use pdfcraft_geom::perspective::{Homography, Point, order_quad};
|
||
use pdfcraft_render::{RenderConfig, RenderRequest};
|
||
|
||
use crate::{DocId, Edit, EditError, ImageResolution, Session};
|
||
|
||
/// The densest the page is read at: 600 dpi, as for OCR.
|
||
const MAX_SCALE: f32 = 600.0 / 72.0;
|
||
/// The resolution a page without a picture is read at.
|
||
const DEFAULT_SCALE: f32 = 300.0 / 72.0;
|
||
/// The most pixels the page is rendered with, and the straightened picture has.
|
||
const MAX_PIXELS: f64 = 40_000_000.0;
|
||
/// JPEG quality of the straightened picture.
|
||
const QUALITY: u8 = 90;
|
||
|
||
/// A straightened picture: RGB8, row-major.
|
||
#[derive(Clone, Debug, PartialEq)]
|
||
pub struct Warped {
|
||
pub width: u32,
|
||
pub height: u32,
|
||
pub rgb: Vec<u8>,
|
||
}
|
||
|
||
/// Warp the quadrilateral `quad` (raster pixels, any corner order) of a premultiplied RGBA
|
||
/// raster to an upright rectangle as large as the quadrilateral's longer sides, composited over
|
||
/// white. Errors say what was wrong with the corners or the raster.
|
||
pub fn warp(rgba: &[u8], width: u32, height: u32, quad: [Point; 4]) -> Result<Warped, String> {
|
||
let (w, h) = (width as usize, height as usize);
|
||
if w == 0 || h == 0 || w.checked_mul(h).and_then(|n| n.checked_mul(4)) != Some(rgba.len()) {
|
||
return Err("the page could not be read as a picture".into());
|
||
}
|
||
let [tl, tr, br, bl] = order_quad(quad).ok_or("the four corners must enclose an area (a convex quadrilateral)")?;
|
||
let dist = |a: Point, b: Point| (a[0] - b[0]).hypot(a[1] - b[1]);
|
||
let mut ow = dist(tl, tr).max(dist(bl, br));
|
||
let mut oh = dist(tl, bl).max(dist(tr, br));
|
||
let k = (MAX_PIXELS / (ow * oh).max(1.0)).sqrt().min(1.0);
|
||
ow = (ow * k).floor().max(1.0);
|
||
oh = (oh * k).floor().max(1.0);
|
||
if !(ow.is_finite() && oh.is_finite()) {
|
||
return Err("the corners are out of range".into());
|
||
}
|
||
// Both are at least 1 and their product is at most MAX_PIXELS, so the casts are exact.
|
||
let (ow, oh) = (ow as u32, oh as u32);
|
||
let rect = [[0.0, 0.0], [ow as f64, 0.0], [ow as f64, oh as f64], [0.0, oh as f64]];
|
||
let to_src = Homography::from_points(rect, [tl, tr, br, bl]).ok_or("the four corners must not be in a line")?;
|
||
|
||
let px = |x: usize, y: usize| -> [f64; 4] {
|
||
let i = (y * w + x) * 4;
|
||
match rgba.get(i..i + 4) {
|
||
Some(p) => [p[0] as f64, p[1] as f64, p[2] as f64, p[3] as f64],
|
||
None => [0.0; 4],
|
||
}
|
||
};
|
||
let mut rgb = Vec::with_capacity(ow as usize * oh as usize * 3);
|
||
for y in 0..oh {
|
||
for x in 0..ow {
|
||
// Sample at the pixel's centre; outside the page is white.
|
||
let mut c = [0.0f64; 4];
|
||
if let Some([sx, sy]) = to_src.apply([x as f64 + 0.5, y as f64 + 0.5]) {
|
||
let (fx, fy) = (sx - 0.5, sy - 0.5);
|
||
if fx > -1.0 && fy > -1.0 && fx < w as f64 && fy < h as f64 {
|
||
let (x0, y0) = (fx.floor(), fy.floor());
|
||
let (ax, ay) = (fx - x0, fy - y0);
|
||
// Clamped to the raster, so every index below is in range.
|
||
let clamp = |v: f64, n: usize| v.clamp(0.0, (n - 1) as f64) as usize;
|
||
let (xa, xb) = (clamp(x0, w), clamp(x0 + 1.0, w));
|
||
let (ya, yb) = (clamp(y0, h), clamp(y0 + 1.0, h));
|
||
let (p00, p10, p01, p11) = (px(xa, ya), px(xb, ya), px(xa, yb), px(xb, yb));
|
||
for (i, v) in c.iter_mut().enumerate() {
|
||
let top = p00[i] * (1.0 - ax) + p10[i] * ax;
|
||
let bottom = p01[i] * (1.0 - ax) + p11[i] * ax;
|
||
*v = top * (1.0 - ay) + bottom * ay;
|
||
}
|
||
}
|
||
}
|
||
// Premultiplied over white: colour + (1 - alpha) × white.
|
||
for v in &c[..3] {
|
||
rgb.push((v + 255.0 - c[3]).round().clamp(0.0, 255.0) as u8);
|
||
}
|
||
}
|
||
}
|
||
Ok(Warped { width: ow, height: oh, rgb })
|
||
}
|
||
|
||
/// The long side, in pixels, a page is rendered at to look for the document's edges.
|
||
const DETECT_SIDE: f32 = 1200.0;
|
||
|
||
impl Session {
|
||
/// Enhance ▸ Camera image: the corners of the photographed document on page `page`
|
||
/// (0-based) of document `id`, in PDF user space (top-left, top-right, bottom-right,
|
||
/// bottom-left as displayed), or `None` when its edges can't be found with confidence.
|
||
pub fn detect_camera_corners(&self, id: DocId, page: usize) -> Option<[Point; 4]> {
|
||
let doc = self.get(id)?;
|
||
let info = doc.info.pages.get(page)?;
|
||
let scale = (DETECT_SIDE / info.width.max(info.height).max(1.0)).clamp(0.05, MAX_SCALE);
|
||
let config = RenderConfig { password: doc.password.as_deref().map(Arc::from), ..Default::default() };
|
||
let shot = pdfcraft_render::PageRenderer::new(doc.bytes.clone(), config).render(RenderRequest { page, scale, ..Default::default() });
|
||
if shot.error.is_some() {
|
||
return None;
|
||
}
|
||
let quad = crate::camera_edges::detect_document(&shot.rgba, shot.width, shot.height)?;
|
||
let k = shot.width as f64 / (info.width as f64).max(1e-3);
|
||
Some(quad.map(|[x, y]| {
|
||
let [u, v] = info.view_to_user((x / k) as f32, (y / k) as f32);
|
||
[u as f64, v as f64]
|
||
}))
|
||
}
|
||
|
||
/// Enhance ▸ Camera image: replace page `page` (0-based) of document `id` with the part of it
|
||
/// inside `corners` (PDF user space, any order), straightened to a rectangle. The page is
|
||
/// read at its picture's own resolution (at most 600 dpi) and keeps that physical size.
|
||
pub fn enhance_camera_page(&mut self, id: DocId, page: usize, corners: [Point; 4]) -> Result<(), EditError> {
|
||
self.enhance_camera_page_at(id, page, corners, crate::camera_clean::Look::Original, 0)
|
||
}
|
||
|
||
/// [`Session::enhance_camera_page`], then give the straightened photo a `look` at `level`
|
||
/// (0 = as photographed … 100 = white paper, strong contrast, no specks; for black and white
|
||
/// the threshold; see [`crate::camera_clean`]). Still one undoable step.
|
||
pub fn enhance_camera_page_at(
|
||
&mut self,
|
||
id: DocId,
|
||
page: usize,
|
||
corners: [Point; 4],
|
||
look: crate::camera_clean::Look,
|
||
level: u8,
|
||
) -> Result<(), EditError> {
|
||
let doc = self.get(id).ok_or(EditError::NoDocument)?;
|
||
if let Some(why) = &doc.read_only_reason {
|
||
return Err(EditError::ReadOnly(why.clone()));
|
||
}
|
||
let info = doc.info.pages.get(page).ok_or_else(|| EditError::Invalid(format!("there is no page {}", page.saturating_add(1))))?;
|
||
let native = doc
|
||
.page_images(page)
|
||
.iter()
|
||
.filter(|i| i.width > 1 && i.height > 1)
|
||
.map(|i| {
|
||
let m = i.matrix;
|
||
let (w, h) = (m[0].hypot(m[1]), m[2].hypot(m[3]));
|
||
(i.width as f64 / w.max(1e-6)).max(i.height as f64 / h.max(1e-6)) as f32
|
||
})
|
||
.filter(|s| s.is_finite())
|
||
.reduce(f32::max);
|
||
let area = (info.width.max(1.0) as f64) * (info.height.max(1.0) as f64);
|
||
let cap = (MAX_PIXELS / area).sqrt() as f32;
|
||
let scale = native.unwrap_or(DEFAULT_SCALE).clamp(1.0, MAX_SCALE).min(cap).max(0.01);
|
||
|
||
let config = RenderConfig { password: doc.password.as_deref().map(Arc::from), ..Default::default() };
|
||
let mut r = pdfcraft_render::PageRenderer::new(doc.bytes.clone(), config);
|
||
let shot = r.render(RenderRequest { page, scale, ..Default::default() });
|
||
if let Some(e) = shot.error {
|
||
return Err(EditError::Invalid(format!("page {} could not be rendered: {e}", page + 1)));
|
||
}
|
||
let k = shot.width as f64 / (info.width as f64).max(1e-3);
|
||
let quad = corners.map(|[x, y]| {
|
||
let [vx, vy] = info.user_to_view(x as f32, y as f32);
|
||
[vx as f64 * k, vy as f64 * k]
|
||
});
|
||
let out = warp(&shot.rgba, shot.width, shot.height, quad).map_err(EditError::Invalid)?;
|
||
let pixels = crate::camera_clean::apply(&out.rgb, out.width, out.height, look, level)
|
||
.ok_or_else(|| EditError::Invalid("the straightened page could not be cleaned up".into()))?;
|
||
// Black and white is lossless (PNG): JPEG would smear grey around every letter.
|
||
let mut encoded = Vec::new();
|
||
let (name, written) = match &pixels {
|
||
crate::camera_clean::Pixels::Rgb(rgb) => (
|
||
"camera.jpg",
|
||
image::ImageEncoder::write_image(
|
||
image::codecs::jpeg::JpegEncoder::new_with_quality(&mut encoded, QUALITY),
|
||
rgb,
|
||
out.width,
|
||
out.height,
|
||
image::ExtendedColorType::Rgb8,
|
||
),
|
||
),
|
||
crate::camera_clean::Pixels::Grey(grey) if look == crate::camera_clean::Look::BlackWhite => (
|
||
"camera.png",
|
||
image::ImageEncoder::write_image(
|
||
image::codecs::png::PngEncoder::new(&mut encoded),
|
||
grey,
|
||
out.width,
|
||
out.height,
|
||
image::ExtendedColorType::L8,
|
||
),
|
||
),
|
||
crate::camera_clean::Pixels::Grey(grey) => (
|
||
"camera.jpg",
|
||
image::ImageEncoder::write_image(
|
||
image::codecs::jpeg::JpegEncoder::new_with_quality(&mut encoded, QUALITY),
|
||
grey,
|
||
out.width,
|
||
out.height,
|
||
image::ExtendedColorType::L8,
|
||
),
|
||
),
|
||
};
|
||
written.map_err(|e| EditError::Invalid(format!("the straightened page could not be encoded: {e}")))?;
|
||
// One device pixel per `k` points keeps the page's physical size.
|
||
let dpi = (k * 72.0).clamp(1.0, 1200.0);
|
||
let bytes = self.create_from_images_with_resolution(&[(name.into(), encoded)], ImageResolution::Dpi(dpi))?;
|
||
let replace = Edit::ReplacePages { pages: vec![page], name: "camera.pdf".into(), bytes, src_pages: vec![0] };
|
||
self.apply(id, Edit::Batch { label: "Enhance camera image".into(), edits: vec![replace] })
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
/// An opaque premultiplied raster filled by `f(x, y) -> [r, g, b]`.
|
||
fn raster(w: u32, h: u32, f: impl Fn(u32, u32) -> [u8; 3]) -> Vec<u8> {
|
||
(0..h)
|
||
.flat_map(|y| (0..w).map(move |x| (x, y)))
|
||
.flat_map(|(x, y)| {
|
||
let [r, g, b] = f(x, y);
|
||
[r, g, b, 255]
|
||
})
|
||
.collect()
|
||
}
|
||
|
||
#[test]
|
||
fn a_tilted_quad_comes_out_upright() {
|
||
// A dark quadrilateral on white; warping exactly its corners leaves a dark picture.
|
||
let quad = [[20.0, 30.0], [170.0, 10.0], [180.0, 150.0], [10.0, 160.0]];
|
||
let inside = |x: f64, y: f64| {
|
||
let q = order_quad(quad).unwrap();
|
||
(0..4).all(|i| {
|
||
let (a, b) = (q[i], q[(i + 1) % 4]);
|
||
(b[0] - a[0]) * (y - a[1]) - (b[1] - a[1]) * (x - a[0]) >= 0.0
|
||
})
|
||
};
|
||
let src = raster(200, 180, |x, y| if inside(x as f64 + 0.5, y as f64 + 0.5) { [20, 20, 20] } else { [255, 255, 255] });
|
||
let out = warp(&src, 200, 180, quad).unwrap();
|
||
// The longer of each pair of opposite sides: 170 × 140.
|
||
assert_eq!((out.width, out.height), (170, 140));
|
||
// Away from the anti-aliased edges, everything is the dark fill.
|
||
let at = |x: u32, y: u32| out.rgb[((y * out.width + x) * 3) as usize];
|
||
for (x, y) in [(5, 5), (85, 70), (164, 134), (5, 134), (164, 5)] {
|
||
assert!(at(x, y) < 60, "({x}, {y}) = {}", at(x, y));
|
||
}
|
||
}
|
||
|
||
#[test]
|
||
fn the_corner_order_does_not_matter() {
|
||
let src = raster(64, 48, |x, y| [(x * 4) as u8, (y * 5) as u8, 128]);
|
||
let q = [[4.0, 3.0], [60.0, 6.0], [58.0, 44.0], [2.0, 40.0]];
|
||
let a = warp(&src, 64, 48, q).unwrap();
|
||
let b = warp(&src, 64, 48, [q[2], q[0], q[3], q[1]]).unwrap();
|
||
assert_eq!(a, b);
|
||
// Left to right the red channel grows, top to bottom the green one does.
|
||
let px = |x: u32, y: u32| &a.rgb[((y * a.width + x) * 3) as usize..][..3];
|
||
assert!(px(a.width - 3, 10)[0] > px(2, 10)[0] + 100);
|
||
assert!(px(10, a.height - 3)[1] > px(10, 2)[1] + 100);
|
||
}
|
||
|
||
#[test]
|
||
fn transparency_becomes_white() {
|
||
let src = vec![0u8; 8 * 8 * 4];
|
||
let out = warp(&src, 8, 8, [[0.0, 0.0], [8.0, 0.0], [8.0, 8.0], [0.0, 8.0]]).unwrap();
|
||
assert!(out.rgb.iter().all(|&v| v == 255));
|
||
}
|
||
|
||
#[test]
|
||
fn bad_corners_and_rasters_are_errors_not_panics() {
|
||
let src = raster(10, 10, |_, _| [0, 0, 0]);
|
||
let line = [[0.0, 0.0], [5.0, 5.0], [10.0, 10.0], [2.0, 2.0]];
|
||
assert!(warp(&src, 10, 10, line).is_err());
|
||
assert!(warp(&src, 10, 10, [[f64::NAN, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]]).is_err());
|
||
let ok = [[0.0, 0.0], [10.0, 0.0], [10.0, 10.0], [0.0, 10.0]];
|
||
assert!(warp(&src, 11, 10, ok).is_err(), "size doesn't match the buffer");
|
||
assert!(warp(&[], 0, 0, ok).is_err());
|
||
// Corners far outside the raster: a capped, white picture, not a huge allocation.
|
||
let far = [[-1e9, -1e9], [1e9, -1e9], [1e9, 1e9], [-1e9, 1e9]];
|
||
let out = warp(&src, 10, 10, far).unwrap();
|
||
assert!((out.width as f64) * (out.height as f64) <= MAX_PIXELS);
|
||
}
|
||
}
|