Add new Nikon & Canon DSLRs

diff --git a/cameras.lisp b/cameras.lisp
index ee51d7131b76a9a8dd71cd4a777db7f322a6ec33..9edbcd3615c20dba4789b6ad9143804007581a80 100644 (file)
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -55,9 +55,13 @@
     (:format :1d :make "Canon" :pixels (2464 . 1648) :imager (27 . 17.8) :name "1D")
     (:format :1dmkii :make "Canon" :pixels (3504 . 2336) :imager (28.7 . 19.1)
      :name "1D Mark II" :nicks (:1d2 :1dii :1dmkii))
+    (:format :1dmkiii :make "Canon" :pixels (3888 . 2592) :imager (28.1 . 18.7)
+     :name "1D Mark III" :nicks (:1d3 :1diii :1dmkiii))
     (: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 :1dsmkiii :make "Canon" :pixels (5616 . 3744) :imager (36 . 24)
+    :name "1Ds Mark III" :nicks (:1ds3 :1dsiii))
     (:format :g7 :make "Canon" :pixels (3648 . 2736) :imager (7.2 . 5.3)
              :name "PowerShot G7")
     (:format :ndigital :make "Contax" :pixels (3040 . 2008) :imager (36 . 24)
@@ -92,12 +96,15 @@
     (: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 :d200 :make "Nikon" :pixels (3872 . 2592) :imager (23.6 . 15.8) :name "D200")
+    (:format :d300 :make "Nikon" :pixels (4288 . 2848) :imager (23.6 . 15.8) :name "D300")
     (: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 :d3 :make "Nikon" :pixels (4256 . 2832) :imager (36 . 23.9) :name "D3")
 
     (: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")

diff --git a/debian/changelog b/debian/changelog
index 328b48155c0ff78d2cd150a9a926a3716b75caad..822088b1ca4dac3d9288f6ff10b3e8539f0fd09f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-photo (0.12-1) unstable; urgency=low
+
+  * Add new cameras
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun,  9 Sep 2007 13:31:20 -0600
+
 cl-photo (0.11-2) unstable; urgency=low
 
   * Add cl-kmrcl dependency (closes:438195)