X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=fov.lisp;fp=fov.lisp;h=2b01e8293c35d223b8e4cfbd8836551277e65024;hb=eee792a28a53084a949496f7ea1a87012f13f7ce;hp=43d000fa4006e5d80a928d398af975c78e40a21a;hpb=c93207f19a0cb2c8d800c1b920796bffebf6f792;p=cl-photo.git diff --git a/fov.lisp b/fov.lisp index 43d000f..2b01e82 100644 --- a/fov.lisp +++ b/fov.lisp @@ -94,12 +94,7 @@ and image distance (mm) for a given image (mm) and object distance (mm)." (let* ((d-width (* 2 object-distance (tan (degrees->radians (/ aov-width 2))))) (d-height (* 2 object-distance (tan (degrees->radians (/ aov-height 2))))) (d-diagonal (* 2 object-distance (tan (degrees->radians (/ aov-diagonal 2)))))) - (values (mm->length d-width units) - (mm->length d-height units) - (mm->length d-diagonal units) - mag - object-distance - image-distance))))) + (values d-width d-height d-diagonal mag object-distance image-distance))))) (defun fov (focal-length frame-width frame-height &key object-distance image-distance magnification