r10449: add camera data

[cl-photo.git] / cameras.lisp

diff --git a/cameras.lisp b/cameras.lisp
index 6e4e74bd8a713d9821ed78cf0ee33b7b7f4eb54a..c10e2839f8447821c247a1fb8cc5a5d73ace2719 100644 (file)
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -1,4 +1,4 @@
-;;;; -*-a Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10; Package: photo -*-
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10; Package: photo -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
@@ -20,7 +20,7 @@
 (in-package #:photo)
 
 (defun sensor-dimensions-megapixels (format megapixels)
-  (let* ((dim (format-dimensions format))
+  (let* ((dim (imager-dimensions format))
          (aspect-ratio (/ (car dim) (cdr dim)))
          (width (round (sqrt (* aspect-ratio 1000000 megapixels)))))
     (cons width (round (/ width aspect-ratio)))))
@@ -35,26 +35,26 @@
 
 (defparameter +format-db+
   '(
-   (:format :d2x :make :nikon :pixels (4288 . 2848) :imager (23.7 . 15.6) :name "D2X")
-   (:format :d100 :make :nikon :pixels (3037 . 2024) :imager (23.7 . 15.6) :name "D100")
-   (:format :d70 :make :nikon :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70")
-   (:format :d70s :make :nikon :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70s")
-   (:format :d50 :make :nikon :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70")
-   (:format :d1x :make :nikon :pixels (4028 . 1324) :imager (23.7 . 15.6) :name "D1X")
-   (:format :d2h :make :nikon :pixels (2464 . 1632) :imager (23.3 . 15.5) :name "D2H")
-   (: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 :d100 :make "Nikon" :pixels (3037 . 2024) :imager (23.7 . 15.6) :name "D100")
+   (:format :d70 :make "Nikon" :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70")
+   (:format :d70s :make "Nikon" :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70s")
+   (:format :d50 :make "Nikon" :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D70")
+   (:format :d1x :make "Nikon" :pixels (4028 . 1324) :imager (23.7 . 15.6) :name "D1X")
+   (:format :d2h :make "Nikon" :pixels (2464 . 1632) :imager (23.3 . 15.5) :name "D2H")
+   (:format :d2hs :make "Nikon" :pixels (2464 . 1632) :imager (23.3 . 15.5) :name "D2Hs")
    
-   (:format :300d :make :canon :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "300D")
-   (:format :10d :make :canon :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "10D")
-   (:format :d30 :make :canon :pixels (0 . 0) :imager (22.7 . 15.1) :name "D30")
-   (:format :d60 :make :canon :pixels (0 . 0) :imager (22.7 . 15.1) :name "D60")
-   (:format :350d :make :canon :pixels (3456 . 2304) :imager (22.2 . 14.8) :name "350D")
-   (:format :1d :make :canon :pixels (2464 . 1648) :imager (27 . 17.8) :name "1D")
-   (:format :20d :make :canon :pixels (3456 . 2304) :imager (22.5 . 15) :name "20D")
-   (:format :1dmkii :make :canon :pixels (3504 . 2336) :imager (28.7 . 19.1)
+   (:format :300d :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "300D")
+   (:format :10d :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "10D")
+   (:format :d30 :make "Canon" :pixels (0 . 0) :imager (22.7 . 15.1) :name "D30")
+    (:format :d60 :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "D60")
+   (:format :350d :make "Canon" :pixels (3456 . 2304) :imager (22.2 . 14.8) :name "350D")
+   (:format :1d :make "Canon" :pixels (2464 . 1648) :imager (27 . 17.8) :name "1D")
+   (:format :20d :make "Canon" :pixels (3456 . 2304) :imager (22.5 . 15) :name "20D")
+   (:format :1dmkii :make "Canon" :pixels (3504 . 2336) :imager (28.7 . 19.1)
     :name "1D Mark II" :nicks (:1d2 :1dii :1dmkii))
-   (:format :1ds :make :canon :pixels (4064 . 3328) :imager (36 . 24) :name "1Ds")
-   (:format :1dsmkii :make :canon :pixels (4992 . 3328) :imager (36 . 24)
+   (:format :1ds :make "Canon" :pixels (4064 . 3328) :imager (36 . 24) :name "1Ds")
+   (:format :1dsmkii :make "Canon" :pixels (4992 . 3328) :imager (36 . 24)
     :name "1Ds Mark II" :nicks (:1ds2 :1dsii))
 
    (:format :35mm :imager (36 . 24) :name "35mm")