X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=cameras.lisp;h=57ef380e87aededf638e654fda678e0fea8abd72;hb=fc8a886945d4cbd4c6bc40d8f5c33b653cc64c07;hp=814e387173ec6952dc448c754f7f25d1e6306a65;hpb=3de8eb0115d319cda845375261d4781b7fbdcade;p=cl-photo.git

diff --git a/cameras.lisp b/cameras.lisp
index 814e387..57ef380 100644
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -91,6 +91,10 @@
     (:format :d2hs :make "Nikon" :pixels (2464 . 1632) :imager (23.3 . 15.5) :name "D2Hs")
     (:format :d2x :make "Nikon" :pixels (4288 . 2848) :imager (23.7 . 15.6) :name "D2X")
 
+    (:format :cp5900 :make "Nikon" :pixels (2592 . 1944) :imager (7.18 . 5.32) :name "Coolpix 5900")
+    (:format :cp7900 :make "Nikon" :pixels (3072 . 2304) :imager (7.18 . 5.32) :name "Coolpix 7900")
+    (:format :cp8800 :make "Nikon" :pixels (3264 . 2448) :imager (8.8 . 6.6) :name "Coolpix 8800")
+
     (:format :*ist-d :make "Pentax" :pixels (3008 . 2008) :imager (36 . 24)
      :name "*ist D")
     (:format :*ist-ds :make "Pentax" :pixels (3008 . 2008) :imager (36 . 24)
@@ -101,6 +105,8 @@
     (:format :sd10 :make "Sigma" :pixels (2268 . 1512) :imager (20.7 . 13.8)
      :name "SD10")
 
+    (:format :1/1.8in :imager (7.18 . 5.32) :name "1/1.8\"")
+    (:format :dx :imager (24 . 16) :name "DX")
     (:format :35mm :imager (36 . 24) :name "35mm")
     
     (:format :6x4.5cm :imager (60 . 45) :name "6x4.5cm" :nicks (:\645))
@@ -184,8 +190,10 @@ so the proper aspect ratio is used."
   "Return pixel size in micrometers."
   (let ((pixel-dim (pixel-dimensions format-spec))
 	(imager-dim (imager-dimensions format-spec)))
-    (values (* 1000 (/ (car imager-dim) (car pixel-dim)))
-	    (* 1000 (/ (cdr imager-dim) (cdr pixel-dim))))))
+    (when (and pixel-dim imager-dim)
+      (values (* 1000 (/ (car imager-dim) (car pixel-dim)))
+	      (* 1000 (/ (cdr imager-dim) (cdr pixel-dim)))))))
+
 (defun output-dimensions (format-spec)
   "Returns the output dimensions in mm of a FORMAT."
   (getf (find-format format-spec) :output))