r10525: change coc so that it takes crops into consideration

diff --git a/dof.lisp b/dof.lisp
index b937da03b19055df8c85133905be2bc4d355bf8d..11f158c77457b591d43f94e75abd89e6a70eb4f7 100644 (file)
--- 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)