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

diff --git a/cameras.lisp b/cameras.lisp
index 814e387..745ea0a 100644
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -91,6 +91,8 @@
     (: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 :cp7900 :make "Nikon" :pixels (3072 . 2304) :imager (7.18 . 5.32) :name "Coolpix 7900")
+
     (: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)
@@ -184,8 +186,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))