From a8fb6b568b815cecb970442af816cc95fe97dc14 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 10 May 2005 19:45:38 +0000 Subject: [PATCH] r10525: change coc so that it takes crops into consideration --- dof.lisp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dof.lisp b/dof.lisp index b937da0..11f158c 100644 --- a/dof.lisp +++ b/dof.lisp @@ -25,13 +25,14 @@ "Returns circle of confusion in mm and print magnification for a format. Default resolving power is 5 lpm at 25cm." - (let* ((imager-diagonal (diagonal (car imager-size) (cdr imager-size))) - (print-diagonal (diagonal (car print-size) (cdr print-size))) - (resolution-factor (/ (* lpm print-diagonal minimum-distance) - (* imager-diagonal viewing-distance))) - (coc (/ 1.0d0 resolution-factor)) - (print-magnification (/ print-diagonal imager-diagonal))) - (values coc print-magnification))) + (let* ((imager-max (max (car imager-size) (cdr imager-size))) + (imager-min (min (car imager-size) (cdr imager-size))) + (print-max (max (car print-size) (cdr print-size))) + (print-min (min (car print-size) (cdr print-size))) + (magnification (max (/ print-max imager-max) (/ print-min imager-min))) + (resolution-factor (/ (* magnification lpm minimum-distance) viewing-distance)) + (coc (/ 1.0d0 resolution-factor))) + (values coc magnification))) (defun coc-format (format &key (lpm 5) (minimum-distance 250) (viewing-distance 250) -- 2.34.1