r10534: remote warnings, add units capability to make-output-format

[cl-photo.git] / fov.lisp

diff --git a/fov.lisp b/fov.lisp
index a66d551f5cc87f0b1f342d8801903171ff89bbf2..80c8f5bc105e1cb5faec4de7bd0eb4455e555905 100644 (file)
--- a/fov.lisp
+++ b/fov.lisp
@@ -159,7 +159,7 @@ focal-length and image-distance are in mm, object-distance is in units"
    (t
     (error "Must set two, and only two, of the parameters: image-distance, object-distance, and focal-length."))))
 
-(defun close-up (&key focal-length object-distance image-distance magnification (units :feet) &aux bellows-factor)
+(defun close-up (&key focal-length object-distance image-distance magnification (units :feet))
   "Computes the parameters for focusing closer than infinity.
 Requires two, and only two, of the input parameters.
 Returns: focal-length object-distance image-distance magnification bellows-factor."
@@ -208,10 +208,8 @@ Returns: focal-length object-distance image-distance magnification bellows-facto
   "Returns the bellows factor, the ratio of effective aperature to actual aperture."
   (1+ (magnification :focal-length focal-length :object-distance object-distance)))
 
-(defun extension-tube (focal-length &key original-object-distance new-object-distance original-image-distance
-                                        original-magnification
-                                        new-object-distance new-image-distance new-magnification
-                                        extension-length (units :feet))
+(defun extension-tube (focal-length &key original-object-distance original-image-distance original-magnification
+                      new-object-distance new-image-distance new-magnification extension-length (units :feet))
   "Computes the parameters for using extension tubes.
 Requires: 1. original-object-distance, original-image-distance, or original-magnification
           2. new-object-distance, new-image-distance, new-magnification, or extension-length