r10494: add cp5900, formats, remove incorrect function

diff --git a/cameras.lisp b/cameras.lisp
index 745ea0a887905de6902560a9783cc3a9bdb450a5..54d38953bf95557501b55935d64497db32ab3b96 100644 (file)
--- a/cameras.lisp
+++ b/cameras.lisp
@@ -91,6 +91,7 @@
     (: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 :*ist-d :make "Pentax" :pixels (3008 . 2008) :imager (36 . 24)
@@ -103,6 +104,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))

diff --git a/dof.lisp b/dof.lisp
index ee9250a745c0d613716cdc405e798f8a8e191019..b937da03b19055df8c85133905be2bc4d355bf8d 100644 (file)
--- a/dof.lisp
+++ b/dof.lisp
@@ -133,5 +133,3 @@ Output: NEAR-POINT, FAR-POINT, TOTAL-DOF, MAGNIFICATION, BLUR-SIZE-OF-INFINITY-P
 (defun mtf-scanner (freq dscan-freq &optional (order 3))
   (abs (expt (kmrcl:sinc (* pi (/ freq dscan-freq))) order)))
 
-(defun freq-mtf-scanner (dscan-freq mtf &optional (order 3))
-  (* dscan-freq (/ (asin (* x (exp  (/ (log mtf) order)))) pi)))