From: Kevin M. Rosenberg Date: Sat, 23 Apr 2005 15:03:31 +0000 (+0000) Subject: r10461: add camera X-Git-Tag: v0.13~30 X-Git-Url: http://git.kpe.io/?p=cl-photo.git;a=commitdiff_plain;h=3de8eb0115d319cda845375261d4781b7fbdcade r10461: add camera --- diff --git a/cameras.lisp b/cameras.lisp index 515c61e..814e387 100644 --- a/cameras.lisp +++ b/cameras.lisp @@ -35,28 +35,72 @@ (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 "D50") - (: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 :dcs3 :make "Canon" :pixels (1268 . 1012) :imager (20.5 . 16.4) :name "EOS DCS1") + (:format :dcs1 :make "Canon" :pixels (3060 . 2036) :imager (27.6 . 18.4) :name "EOS DCS3") + (:format :d2000 :make "Canon" :pixels (1728 . 1152) :imager (22.8 . 15.5) :name "EOS D2000") + (:format :d6000 :make "Canon" :pixels (3040 . 2008) :imager (27.6 . 18.4) :name "EOS D6000") (:format :d30 :make "Canon" :pixels (2160 . 1440) :imager (22 . 14.9) :name "D30") (:format :d60 :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "D60") + (:format :10d :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "10D") + (:format :20d :make "Canon" :pixels (3456 . 2304) :imager (22.5 . 15) :name "20D") + (:format :300d :make "Canon" :pixels (3072 . 2048) :imager (22.7 . 15.1) :name "300D") (: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) :name "1Ds Mark II" :nicks (:1ds2 :1dsii)) + (:format :ndigital :make "Contax" :pixels (3040 . 2008) :imager (36 . 24) + :name "N Digital") + + (:format :s1pro :make "FujiFilm" :pixels (3040 . 2016) :imager (23 . 15.5) + :name "FinePix S1 Pro") + (:format :s2pro :make "FujiFilm" :pixels (4256 . 2848) :imager (23 . 15.5) + :name "FinePix S2 Pro") + (:format :s3pro :make "FujiFilm" :pixels (4256 . 2848) :imager (23 . 15.5) + :name "FinePix S2 Pro") + + (:format :dcs100 :make "Kodak" :pixels (1280 . 1024) :imager (20.5 . 16.4) :name "DCS 100") + (:format :dcs200 :make "Kodak" :pixels (1524 . 1008) :imager (14 . 9.3) :name "DCS 200") + (:format :dcs315 :make "Kodak" :pixels (1520 . 1008) :imager nil :name "DCS 315") + (:format :dcs330 :make "Kodak" :pixels (2008 . 1504) :imager nil :name "DCS 330") + (:format :dcs420 :make "Kodak" :pixels (1524 . 1012) :imager (14 . 9.3) :name "DCS 420") + (:format :dcs460 :make "Kodak" :pixels (3060 . 2036) :imager (27.6 . 18.4) :name "DCS 460") + (:format :dcs520 :make "Kodak" :pixels (1728 . 1152) :imager (22.8 . 15.5) :name "DCS 520") + (:format :dcs560 :make "Kodak" :pixels (3040 . 2008) :imager (27.6 . 18.4) :name "DCS 560") + (:format :dcs620 :make "Kodak" :pixels (1728 . 1152) :imager (22.8 . 15.5) :name "DCS 620") + (:format :dcs660 :make "Kodak" :pixels (3040 . 2008) :imager (27.6 . 18.4) :name "DCS 660") + (:format :dcs720x :make "Kodak" :pixels (1728 . 1152) :imager (22.8 . 15.5) :name "DCS 720x") + (:format :dcs760 :make "Kodak" :pixels (3040 . 2008) :imager (27.6 . 18.4) :name "DCS 760") + (:format :dcsslr/n :make "Kodak" :pixels (4500 . 3000) :imager (36 . 24) :name "DCS SLR/n") + (:format :dcsslr/c :make "Kodak" :pixels (4500 . 3000) :imager (36 . 24) :name "DCS SLR/n") + (:format :dcs14n :make "Kodak" :pixels (4536 . 3024) :imager (36 . 24) :name "DCS 14n") + + (:format :maxxum7d :make "Konica Minolta" :pixels (3008 . 2000) :imager (23.5 . 15.5) + :name "Maxxum 7D") + + (:format :d1 :make "Nikon" :pixels (2000 . 1312) :imager (23.7 . 15.6) :name "D1") + (:format :d1x :make "Nikon" :pixels (4028 . 1324) :imager (23.7 . 15.6) :name "D1X") + (:format :d100 :make "Nikon" :pixels (3037 . 2024) :imager (23.7 . 15.6) :name "D100") + (:format :d50 :make "Nikon" :pixels (3008 . 2000) :imager (23.7 . 15.6) :name "D50") + (: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 :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 :*ist-d :make "Pentax" :pixels (3008 . 2008) :imager (36 . 24) + :name "*ist D") + (:format :*ist-ds :make "Pentax" :pixels (3008 . 2008) :imager (36 . 24) + :name "*ist DS") + + (:format :sd9 :make "Sigma" :pixels (2268 . 1512) :imager (20.7 . 13.8) + :name "SD9") + (:format :sd10 :make "Sigma" :pixels (2268 . 1512) :imager (20.7 . 13.8) + :name "SD10") + (:format :35mm :imager (36 . 24) :name "35mm") (:format :6x4.5cm :imager (60 . 45) :name "6x4.5cm" :nicks (:\645)) @@ -89,9 +133,9 @@ (return nil)) ((and (getf a :make) (null (getf b :make))) (return t)) - ((string-greaterp (getf a :make) (getf b :make)) - (return t)) ((string-lessp (getf a :make) (getf b :make)) + (return t)) + ((string-greaterp (getf a :make) (getf b :make)) (return nil))) (when (and (getf a :name) (getf b :name)) (cond