projects
/
cl-photo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10534: remote warnings, add units capability to make-output-format
[cl-photo.git]
/
cameras.lisp
diff --git
a/cameras.lisp
b/cameras.lisp
index 57ef380e87aededf638e654fda678e0fea8abd72..7eb8b6700bbb96fac819e61f19c3541cf5b2e9bd 100644
(file)
--- 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))
(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)
(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)))))))
:name name
:nicks (list (kmrcl:ensure-keyword (format nil "~Dx~D" w h)))))))