X-Git-Url: http://git.kpe.io/?p=cl-photo.git;a=blobdiff_plain;f=cameras.lisp;h=7eb8b6700bbb96fac819e61f19c3541cf5b2e9bd;hp=57ef380e87aededf638e654fda678e0fea8abd72;hb=431903301170bffaea3a481813a210dc407d0455;hpb=e95f4d9e6baa23bac6d54d52deb739676769b10f

diff --git a/cameras.lisp b/cameras.lisp
index 57ef380..7eb8b67 100644
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -27,9 +27,15 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun make-output-format (w h &key (units :inches))
-    (let ((name (format nil "~Dx~Din" w h)))
+    (let ((name (format nil "~Dx~D~A" w h
+			(ecase units
+			  (:inches "in")
+			  (:mm "mm")
+			  (:cm "cm")
+			  (:m "m")
+			  (:feet "ft")))))
       (list :format (kmrcl:ensure-keyword name)
-            :output (cons (inches->mm w) (inches->mm h))
+            :output (cons (length->mm w units) (length->mm h units))
             :name name
             :nicks (list (kmrcl:ensure-keyword (format nil "~Dx~D" w h)))))))