X-Git-Url: http://git.kpe.io/?p=cl-photo.git;a=blobdiff_plain;f=dof.lisp;h=f1cd7b245a71b07bd95e1afdcfcf81a5bc15bcce;hp=8dfdf1478ac32981d9472a92fc1bb7d1d6e70e33;hb=6290486a001d80c01676dfd9c2ac053cb4bc1871;hpb=b304f0ff9a505a3654c39f321a3a62de0281f869

diff --git a/dof.lisp b/dof.lisp
index 8dfdf14..f1cd7b2 100644
--- a/dof.lisp
+++ b/dof.lisp
@@ -24,29 +24,29 @@
   (if (>= (car size) (cdr size))
       (cons (cdr size) (car size))
       (cons (car size) (cdr size))))
-  
+
 (defun print-magnification (imager-size print-size)
   "Returns the magnification required between an imager and print sizes
 while taking crop into consideration."
   (setf imager-size (sort-size imager-size))
   (setf print-size (sort-size print-size))
   (float (max (/ (car print-size) (car imager-size))
-	      (/ (cdr print-size) (cdr print-size)))))
+              (/ (cdr print-size) (cdr print-size)))))
 
-(defun coc (imager-size &key (lpm 5) (minimum-distance 250) 
+(defun coc (imager-size &key (lpm 5) (minimum-distance 250)
                    (viewing-distance 250)
                    (print-size (output-dimensions :8x10in)))
-  "Returns circle of confusion in mm and print magnification for a format. 
+  "Returns circle of confusion in mm and print magnification for a format.
 Default resolving power is 5 lpm at 25cm."
   (let* ((magnification (print-magnification imager-size print-size))
-	 (resolution-factor (/ (* magnification lpm minimum-distance) viewing-distance))
-	 (coc (/ 1.0d0 resolution-factor)))
+         (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) 
+(defun coc-format (format &key (lpm 5) (minimum-distance 250)
                           (viewing-distance 250)
                           (print-size (output-dimensions :8x10in)))
-  "Returns circle of confusion in mm and print magnification for a format. 
+  "Returns circle of confusion in mm and print magnification for a format.
 Default resolving power is 5 lpm at 25cm."
 
   (let* ((format-size (imager-dimensions format))
@@ -62,9 +62,9 @@ Default resolving power is 5 lpm at 25cm."
   "Returns lpm and circle of confusion based on pixel size."
   (when (and (consp imager) (consp pixels))
     (let ((coc-w (float (* 2 (/ (car imager) (car pixels)))))
-	  (coc-h (float (* 2 (/ (cdr imager) (cdr pixels))))))
+          (coc-h (float (* 2 (/ (cdr imager) (cdr pixels))))))
     (values coc-w coc-h (/ 1. coc-w) (/ 1. coc-h)))))
-  
+
 (defun coc-pixels-format (format)
   "Returns circle of confusion based on pixel size."
   (coc-pixels (imager-dimensions format) (pixel-dimensions format)))
@@ -88,7 +88,7 @@ Default resolving power is 5 lpm at 25cm."
 Six values are returned:
 near point, far point, total dof, magnification, blur size at infinity (mm).
 Circle of confusion can either be a number or keyword designating format."
-  (let* ((aperture (/ focal-length f-stop)) 
+  (let* ((aperture (/ focal-length f-stop))
          (numerator-1 (* (- pupil-factor 1) (- distance focal-length)
                          coc focal-length))
          (numerator-2 (* pupil-factor aperture focal-length distance))
@@ -124,10 +124,10 @@ Pupil factor is the ratio of the exit to enterance pupil diameters."
 
 (defun dof (focal-length f-stop distance coc &key (units :mm) (pupil-factor 1))
   "Returns the Depth of Field.
-Input: FOCAL-LENGTH, F-STOP, DISTANCE, CIRCLE-OF-CONFUSION. 
+Input: FOCAL-LENGTH, F-STOP, DISTANCE, CIRCLE-OF-CONFUSION.
 Output: NEAR-POINT, FAR-POINT, TOTAL-DOF, MAGNIFICATION, BLUR-SIZE-OF-INFINITY-POINT-IN-MM."
   (multiple-value-bind (near-point far-point total-dof mag blur)
-      (dof-mm focal-length f-stop (length->mm distance units) coc 
+      (dof-mm focal-length f-stop (length->mm distance units) coc
               :pupil-factor pupil-factor)
     (values (mm->length near-point units)
             (mm->length far-point units)