File lens_database_update.diff of Package lensfun

Index: db/mil-panasonic.xml
===================================================================
--- db/mil-panasonic.xml	(.../tags/0.2.5/data)	(Revision 0)
+++ db/mil-panasonic.xml	(.../trunk/data)	(Revision 157)
@@ -0,0 +1,122 @@
+<lensdatabase>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-G1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GF1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GH1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GX1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-G2</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GF2</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GH2</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-G3</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-GF3</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-G10</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <lens>
+        <maker>Panasonic</maker>
+        <model>LUMIX G 20/F1.7</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="20" a="0.00789316" b="-0.04009" c="0.00949904" />
+            <!-- Alternative model from http://xraynaudphotos.free.fr/lensfun.php -->
+            <!-- distortion model="ptlens" focal="20" a="-0.0160" b="-0.0470" c="-0.0140" -->
+            <vignetting model="pa" focal="20" aperture="1.7" distance="100" k1="-1.18453" k2="1.18468" k3="-0.77676" />
+            <vignetting model="pa" focal="20" aperture="2.0" distance="100" k1="-0.50428" k2="-0.46084" k3="0.38333" />
+            <vignetting model="pa" focal="20" aperture="2.5" distance="100" k1="-0.02049" k2="-1.00156" k3="0.54046" />
+            <vignetting model="pa" focal="20" aperture="3.2" distance="100" k1="-0.06459" k2="-0.60501" k3="0.27001" />
+            <vignetting model="pa" focal="20" aperture="4.0" distance="100" k1="-0.09156" k2="-0.56989" k3="0.38586" />
+            <vignetting model="pa" focal="20" aperture="5.0" distance="100" k1="-0.13452" k2="-0.46186" k3="0.32235" />
+            <tca model="poly3" focal="20" br="-0.0001356" vr="1.0004113" bb="-0.0000369" vb="1.0002529" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Panasonic</maker>
+        <model>LUMIX G VARIO 14-42/F3.5-5.6</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="14" a="0.040" b="-0.121" c="0.038" />
+            <distortion model="ptlens" focal="20" a="0.020" b="-0.060" c="0.035" />
+            <distortion model="ptlens" focal="29" a="0.013" b="-0.029" c="0.016" />
+            <distortion model="ptlens" focal="36" a="0.015" b="-0.034" c="0.032" />
+            <distortion model="ptlens" focal="42" a="0.003" b="-0.001" c="0.002" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Panasonic</maker>
+        <model>LUMIX G VARIO 45-200mm F4.0-5.6</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="45" a="-0.001" b="0.003" c="-0.03" />
+            <distortion model="ptlens" focal="56" a="0.003" b="-0.006" c="0.08" />
+            <distortion model="ptlens" focal="61" a="0.004" b="-0.003" c="0.04" />
+            <distortion model="ptlens" focal="103" a="-0.001" b="0.007" c="0.002" />
+            <distortion model="ptlens" focal="144" a="-0.005" b="0.023" c="-0.015" />
+            <distortion model="ptlens" focal="180" a="-0.003" b="0.020" c="-0.017" />
+            <distortion model="ptlens" focal="200" a="0.004" b="-0.007" c="0.012" />
+        </calibration>
+    </lens>
+
+</lensdatabase>

Eigenschaftsänderungen: db/mil-panasonic.xml
___________________________________________________________________
Hinzugefügt: svn:eol-style
   + native

Index: db/slr-canon.xml
===================================================================
--- db/slr-canon.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-canon.xml	(.../trunk/data)	(Revision 157)
@@ -15,6 +15,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS 5D Mark III</model>
+        <model lang="en">EOS 5D Mark III</model>
+        <mount>Canon EF</mount>
+        <cropfactor>1.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS 5D Mark II</model>
         <model lang="en">EOS 5D Mark II</model>
         <mount>Canon EF</mount>
@@ -152,6 +160,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS DIGITAL REBEL T3</model>
+        <model lang="en">EOS Digital Rebel T3</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS DIGITAL REBEL XSi</model>
         <model lang="en">EOS Digital Rebel XSi</model>
         <mount>Canon EF-S</mount>
@@ -233,6 +249,22 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS 550D</model>
+        <model lang="en">EOS 550D</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
+        <model>Canon EOS 600D</model>
+        <model lang="en">EOS 600D</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS 1000D</model>
         <model lang="en">EOS 1000D</model>
         <mount>Canon EF-S</mount>
@@ -241,6 +273,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS 1100D</model>
+        <model lang="en">EOS 1100D</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS Kiss Digital N</model>
         <model lang="en">EOS Kiss Digital N</model>
         <mount>Canon EF-S</mount>
@@ -249,6 +289,22 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS Kiss Digital F</model>
+        <model lang="en">EOS Kiss Digital F</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
+        <model>Canon EOS Kiss Digital X50</model>
+        <model lang="en">EOS Kiss Digital X50</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS Kiss Digital</model>
         <model lang="en">EOS Kiss Digital</model>
         <mount>Canon EF-S</mount>
@@ -265,6 +321,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon EOS 60D</model>
+        <model lang="en">EOS 60D</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon EOS 50D</model>
         <model lang="en">EOS 50D</model>
         <mount>Canon EF-S</mount>
@@ -462,6 +526,35 @@
 
     <lens>
         <maker>Canon</maker>
+        <model>Canon EF-S 18-55mm f/3.5-5.6 III</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="18" a="0.00029" b="-0.00065" c="-0.04054" />
+            <distortion model="ptlens" focal="20" a="0.00913" b="-0.024255" c="-0.02326" />
+            <distortion model="ptlens" focal="21" a="0.0219" b="-0.05865" c="0.01747" />
+            <distortion model="ptlens" focal="24" a="0.02945" b="-0.07112" c="0.02358" />
+            <distortion model="ptlens" focal="27" a="-0.00225" b="0.00421" c="-0.02519" />
+            <distortion model="ptlens" focal="28" a="0.00888" b="-0.02851" c="0.00655" />
+            <distortion model="ptlens" focal="29" a="-0.00423" b="0.01103" c="-0.02517" />
+            <distortion model="ptlens" focal="30" a="-0.02064" b="0.0652" c="-0.07411" />
+            <distortion model="ptlens" focal="33" a="0.00378" b="-0.00627" c="-0.00869" />
+            <distortion model="ptlens" focal="34" a="0.00579" b="-0.01787" c="0.00697" />
+            <distortion model="ptlens" focal="36" a="0.00139" b="0.00016" c="-0.00891" />
+            <distortion model="ptlens" focal="37" a="-0.01074" b="0.01955" c="0.00324" />
+            <distortion model="ptlens" focal="40" a="-0.00209" b="-0.00426" c="-0.01103" />
+            <distortion model="ptlens" focal="41" a="-0.00308" b="0.01968" c="-0.03451" />
+            <distortion model="ptlens" focal="43" a="-0.00935" b="0.02372" c="-0.03174" />
+            <distortion model="ptlens" focal="44" a="0.00283" b="0.00211" c="-0.01406" />
+            <distortion model="ptlens" focal="47" a="-0.01247" b="0.03006" c="-0.01156" />
+            <distortion model="ptlens" focal="49" a="0.00841" b="-0.04436" c="0.06329" />
+            <distortion model="ptlens" focal="53" a="0.00359" b="-0.01264" c="0.01563" />
+            <distortion model="ptlens" focal="55" a="-0.0117" b="0.03217" c="-0.02069" />
+        </calibration>
+    </lens>
+    
+    <lens>
+        <maker>Canon</maker>
         <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
         <mount>Canon EF-S</mount>
         <cropfactor>1.6</cropfactor>
@@ -653,6 +746,26 @@
 
     <lens>
         <maker>Canon</maker>
+        <model>Canon EF 35-105mm f/4.5-5.6</model>
+        <mount>Canon EF</mount>
+        <cropfactor>1.6</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="35" a="-0.00202" b="0.00115" c="-0.00877" />
+            <distortion model="ptlens" focal="48" a="0.00206" b="-0.00395" c="0.00411" />
+            <distortion model="ptlens" focal="57" a="-0.00649" b="0.02493" c="-0.01898" />
+            <distortion model="ptlens" focal="62" a="-0.01071" b="0.01858" c="0.00875" />
+            <distortion model="ptlens" focal="68" a="-0.02787" b="0.07826" c="-0.05368" />
+            <distortion model="ptlens" focal="72" a="-0.03351" b="0.12504" c="-0.14162" />
+            <distortion model="ptlens" focal="76" a="0.00385" b="-0.0011" c="-0.00351" />
+            <distortion model="ptlens" focal="80" a="0.01832" b="-0.05905" c="0.07657" />
+            <distortion model="ptlens" focal="87" a="-0.03411" b="0.14077" c="-0.17993" />
+            <distortion model="ptlens" focal="98" a="0.0103" b="-0.03257" c="0.02861" />
+            <distortion model="ptlens" focal="105" a="0.03329" b="-0.012513" c="0.16021" />
+        </calibration>
+    </lens>
+    
+    <lens>
+        <maker>Canon</maker>
         <model>Canon EF 35-135mm f/4-5.6 USM</model>
         <mount>Canon EF</mount>
         <cropfactor>1.6</cropfactor>
@@ -790,6 +903,49 @@
 
     <lens>
         <maker>Canon</maker>
+        <model>Canon EF 70-300mm f/4-5.6 IS USM</model>
+        <mount>Canon EF</mount>
+        <cropfactor>1.6</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398" />
+            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557" />
+            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464" />
+            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0" />
+            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Canon</maker>
+        <model>Canon EF 75-300mm f/4-5.6 III</model>
+        <mount>Canon EF</mount>
+        <cropfactor>1.6</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="75" a="0.47796" b="-0.98871" c="0.74143" />
+            <distortion model="ptlens" focal="80" a="0.73577" b="-1.35909" c="0.82695" />
+            <distortion model="ptlens" focal="85" a="0.18115" b="-0.23959" c="0.18792" />
+            <distortion model="ptlens" focal="90" a="0.86117" b="-1.83099" c="1.24221" />
+            <distortion model="ptlens" focal="95" a="1.1097" b="-2.53267" c="1.80147" />
+            <distortion model="ptlens" focal="100" a="0.69157" b="-1.62711" c="1.19887" />
+            <distortion model="ptlens" focal="105" a="0.26436" b="-0.64004" c="0.49201" />
+            <distortion model="ptlens" focal="110" a="0.29814" b="-0.72389" c="0.55478" />
+            <distortion model="ptlens" focal="125" a="0.14326" b="-0.39549" c="0.34747" />
+            <distortion model="ptlens" focal="130" a="0.06614" b="-0.16946" c="0.14396" />
+            <distortion model="ptlens" focal="135" a="0.09381" b="-0.23171" c="0.18154" />
+            <distortion model="ptlens" focal="140" a="0.00267" b="-0.01604" c="0.02513" />
+            <distortion model="ptlens" focal="155" a="-0.00101" b="0.01422" c="-0.0204" />
+            <distortion model="ptlens" focal="160" a="-0.09721" b="0.28794" c="-0.28178" />
+            <distortion model="ptlens" focal="180" a="0.00049" b="-0.01582" c="0.01736" />
+            <distortion model="ptlens" focal="200" a="-0.00084" b="0.01896" c="-0.01011" />
+            <distortion model="ptlens" focal="240" a="0.04928" b="-0.11522" c="0.02023" />
+            <distortion model="ptlens" focal="255" a="0.02046" b="-0.05515" c="0.05526" />
+            <distortion model="ptlens" focal="280" a="-0.00732" b="0.01809" c="-0.00273" />
+            <distortion model="ptlens" focal="300" a="-0.00709" b="0.03947" c="-0.05006" />
+        </calibration>
+    </lens>
+    
+    <lens>
+        <maker>Canon</maker>
         <model>Canon EF 75-300mm f/4-5.6 IS USM</model>
         <mount>Canon EF</mount>
         <cropfactor>1.6</cropfactor>
@@ -1066,6 +1222,13 @@
         <model>Canon EF-S 55-250 f/4-5.6 IS</model>
         <mount>Canon EF</mount>
         <cropfactor>1.6</cropfactor>
+        <calibration> <!-- data gathered by Spoilerhead 2010 <spoilerhead@gmail.com> using hugin-->
+            <distortion model="ptlens" focal="55" a="-0.000303056" b="-0.00581537" c="-0.00237143" /> <!-- 15 shots-->
+            <distortion model="ptlens" focal="70" a="-0.000520255" b="2.86405e-05" c="0.00286934" />  <!-- 21 shots -->
+            <distortion model="ptlens" focal="100" a="0.00268582" b="-0.00578304" c="0.00718748" />   <!-- 17-->
+            <distortion model="ptlens" focal="135" a="0.00120309" b="0.00979416" c="-0.00868762" />    <!-- 15 -->
+            <distortion model="ptlens" focal="250" a="-0.00226069" b="0.0111545" c="-0.00536676" />    <!-- 18 -->
+        </calibration>
     </lens>
 
     <lens>
@@ -1101,4 +1264,19 @@
         </calibration>
     </lens>
 
+    <lens>
+        <maker>Canon</maker>
+        <model>Canon EF-S 17-55mm f/2.8 IS USM</model>
+        <mount>Canon EF-S</mount>
+        <cropfactor>1.6</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="17" k1="-0.01500" />
+            <distortion model="poly3" focal="20" k1="-0.00100" />
+            <distortion model="poly3" focal="24" k1="+0.00000" />
+            <distortion model="poly3" focal="28" k1="+0.01000" />
+            <distortion model="poly3" focal="35" k1="+0.02000" />
+            <distortion model="poly3" focal="55" k1="+0.02000" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/mil-samsung.xml
===================================================================
--- db/mil-samsung.xml	(.../tags/0.2.5/data)	(Revision 0)
+++ db/mil-samsung.xml	(.../trunk/data)	(Revision 157)
@@ -0,0 +1,83 @@
+<!--
+MIL stands for Mirrorless Interchangeable Lens, see
+http://en.wikipedia.org/wiki/Mirrorless_interchangeable-lens_camera
+-->
+<lensdatabase>
+    <mount>
+        <name>Samsung NX</name>
+        <name lang="en">Samsung NX</name>
+        <compat>Generic</compat>
+        <compat>Pentax K</compat>
+    </mount>
+
+    <camera>
+        <maker>SAMSUNG</maker>
+        <maker lang="en">Samsung</maker>
+        <model>NX10</model>
+         <model lang="en">NX10</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SAMSUNG</maker>
+        <maker lang="en">Samsung</maker>
+        <model>NX11</model>
+         <model lang="en">NX11</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SAMSUNG</maker>
+        <maker lang="en">Samsung</maker>
+        <model>NX100</model>
+         <model lang="en">NX100</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SAMSUNG</maker>
+        <maker lang="en">Samsung</maker>
+        <model>NX20</model>
+         <model lang="en">NX20</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SAMSUNG</maker>
+        <maker lang="en">Samsung</maker>
+        <model>NX200</model>
+         <model lang="en">NX200</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+    </camera>
+
+    <lens>
+        <maker>Samsung</maker>
+        <model>Samsung 20-50mm F3.5-5.6 Compact Zoom</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="20" a="0.01347" b="-0.05952" c="0.01561" />
+            <distortion model="ptlens" focal="24" a="0.00549" b="-0.03312" c="0.00984" />
+            <distortion model="ptlens" focal="28" a="0.01064" b="-0.04256" c="0.03338" />
+            <distortion model="ptlens" focal="35" a="-0.001" b="-0.00843" c="0.02713" />
+            <distortion model="ptlens" focal="45" a="0.00716" b="-0.0379" c="0.06902" />
+            <distortion model="ptlens" focal="50" a="-0.02119" b="0.06813" c="-0.06118" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Samsung</maker>
+        <model>Samsung 30mm F2 Pancake</model>
+        <mount>Samsung NX</mount>
+        <cropfactor>1.54</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="30" k1="-0.00596" />
+        </calibration>
+    </lens>
+
+</lensdatabase>

Eigenschaftsänderungen: db/mil-samsung.xml
___________________________________________________________________
Hinzugefügt: svn:eol-style
   + native

Index: db/slr-sigma.xml
===================================================================
--- db/slr-sigma.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-sigma.xml	(.../trunk/data)	(Revision 157)
@@ -331,7 +331,7 @@
 
     <lens>
         <maker>Sigma</maker>
-        <model>Sigma 50-300mm f/4-6.3 EX DG/HSM</model>
+        <model>Sigma 50-500mm f/4-6.3 EX DG HSM</model>
         <mount>Sigma</mount>
         <mount>Canon EF</mount>
         <mount>Nikon F AF</mount>
Index: db/slr-tamron.xml
===================================================================
--- db/slr-tamron.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-tamron.xml	(.../trunk/data)	(Revision 157)
@@ -26,6 +26,26 @@
 
     <lens>
         <maker>Tamron</maker>
+        <model>Tamron 17-50mm f/2.8 XR Di II LD</model>
+        <mount>Canon EF</mount>
+        <mount>Nikon F AF</mount>
+        <mount>Pentax KAF</mount>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="17" a="0.02667" b="-0.07161" c="0.02012" />
+            <distortion model="ptlens" focal="24" a="0.02791" b="-0.08057" c="0.07132" />
+            <distortion model="ptlens" focal="35" a="-0.01098" b="0.0448" c="-0.04755" />
+            <distortion model="ptlens" focal="50" a="-0.00372" b="0.01796" c="-0.01334" />
+            <tca model="poly3" focal="17" br="0.0000205" vr="1.0005975" bb="-0.0001325" vb="1.0008428" />
+            <tca model="poly3" focal="24" br="-0.0000073" vr="1.0004585" bb="-0.0000382" vb="1.0004269" />
+            <tca model="poly3" focal="35" br="-0.0000351" vr="1.0002419" bb="-0.0000228" vb="1.0001575" />
+            <tca model="poly3" focal="50" br="-0.0000294" vr="1.0000100" bb="-0.0000149" vb="0.9999915" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Tamron</maker>
         <model>Tamron 18-200mm f/3.5-6.3 XR Di II LD</model>
         <mount>Canon EF</mount>
         <mount>Nikon F AF</mount>
@@ -161,4 +181,53 @@
         </calibration>
     </lens>
 
+    <lens>
+        <maker>Tamron</maker>
+        <model>Tamron 35-70mm F/3.5 CF MACRO</model>
+        <mount>Nikon F</mount>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="35" k1="-0.00768" />
+            <distortion model="ptlens" focal="40" a="0.0012" b="-0.00676" c="0.00204" />
+            <distortion model="ptlens" focal="50" a="-0.00143" b="0.00459" c="-0.00465" />
+            <distortion model="poly3" focal="70" k1="0.00233" />	    
+	        <tca model="poly3" focal="35" br="-0.00004" vr="1.00018" bb="0.00007" vb="0.999835" />
+	        <tca model="poly3" focal="40" br="-0.00003" vr="1.00011" bb="0.000021" vb="0.999909" />
+            <tca model="poly3" focal="50" br="-0.0000088" vr="1.0000432" bb="0.0000117" vb="0.9999312" />
+            <tca model="poly3" focal="70" br="-0.0000079" vr="1.0000614" bb="-0.0000911" vb="1.000192" />
+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.11121" k2="0.08366" k3="-0.10313" />
+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.07601" k2="0.00922" k3="-0.04755" />
+	        <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.25218" k2="0.278" k3="-0.15618" />
+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.21197" k2="-0.08795" k3="0.07518" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Tamron</maker>
+        <model>Tamron AF70-300mm F/4-5.6 LD MACRO</model>
+        <mount>Canon EF</mount>
+        <mount>Nikon F AF</mount>
+        <mount>Pentax KAF2</mount>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+	        <distortion model="ptlens" focal="70" a="0.00168" b="-0.00649" c="0.0021" />
+ 	        <distortion model="ptlens" focal="100" a="-0.00287" b="0.01075" c="-0.00716" />
+	        <distortion model="ptlens" focal="133" a="0.00404" b="-0.0061" c="0.00845" />
+	        <distortion model="ptlens" focal="180" a="0.0" b="0.00388" c="0.0" />
+	        <distortion model="ptlens" focal="300" a="0.0" b="0.00442" c="0.0" />
+            <tca model="poly3" focal="70" br="-0.0000487" vr="1.0002053" bb="0.0000352" vb="0.9998612" />
+            <tca model="poly3" focal="100" br="-0.0000402" vr="1.0000889" bb="0.0000026" vb="0.9998133" />
+            <tca model="poly3" focal="133" br="-0.0000210" vr="0.9999776" bb="0.0000067" vb="0.9998469" />
+            <tca model="poly3" focal="180" br="-0.0000139" vr="0.9998566" bb="0.0000295" vb="0.999785" />
+            <tca model="poly3" focal="300" br="-0.000011" vr="0.9996417" bb="0.000022" vb="0.9998125" />
+            <vignetting model="pa" focal="70" aperture="11" distance="1000" k1="-0.05486" k2="0.04427" k3="-0.01908" />
+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.07719" k2="0.13209" k3="-0.09579" />
+            <vignetting model="pa" focal="133" aperture="11" distance="1000" k1="-0.05807" k2="0.07773" k3="-0.05601" />
+            <vignetting model="pa" focal="180" aperture="11" distance="1000" k1="-0.03723" k2="0.02431" k3="-0.02236" />
+            <vignetting model="pa" focal="300" aperture="11" distance="1000" k1="-0.03866" k2="0.05966" k3="-0.04464" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/compact-panasonic.xml
===================================================================
--- db/compact-panasonic.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/compact-panasonic.xml	(.../trunk/data)	(Revision 157)
@@ -17,7 +17,6 @@
 
     <mount>
         <name>panasonicLX3</name>
-        <compat>Generic</compat>
     </mount>
 
     <mount>
@@ -96,14 +95,37 @@
     <camera>
         <maker>Panasonic</maker>
         <model>DMC-LX3</model>
-        <variant>16:9</variant>
         <variant>4:3</variant>
-        <mount>panasonicLX3</mount>
-        <cropfactor>4.33</cropfactor>
+        <mount>PanasonicLX3</mount>
+        <cropfactor>4.7</cropfactor>
     </camera>
 
     <camera>
         <maker>Panasonic</maker>
+        <model>DMC-LX3</model>
+        <variant>16:9</variant>
+        <mount>PanasonicLX3</mount>
+        <cropfactor>5.7528</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-LX3</model>
+        <variant>3:2</variant>
+        <mount>PanasonicLX3</mount>
+        <cropfactor>5.1</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
+        <model>DMC-LX3</model>
+        <variant>1:1</variant>
+        <mount>PanasonicLX3</mount>
+        <cropfactor>4.7</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Panasonic</maker>
         <model>DMC-LC1</model>
         <mount>leicaDigilux2</mount>
         <cropfactor>3.933</cropfactor>
@@ -269,23 +291,25 @@
 
     <lens>
         <maker>Leica</maker>
-        <model>Standard</model>
+        <model>LX3</model>
         <mount>panasonicLX3</mount>
-        <cropfactor>4.33</cropfactor>
+        <focal min="5.1" max="12.8" />
+        <aperture min="2.0" max="8.0" />
+        <cropfactor>4.7</cropfactor>
         <calibration>
-            <distortion model="ptlens" focal="5.1"   a="0.0053"   b="-0.0382" c="0" />
-            <distortion model="ptlens" focal="5.4"   a="0.002"    b="-0.027"  c="-0.005" />
-            <distortion model="ptlens" focal="5.9"   a="0.001"    b="-0.022"  c="-0.004" />
-            <distortion model="ptlens" focal="6.3"   a="0.0007"   b="-0.021"  c="-0.001" />
-            <distortion model="ptlens" focal="6.8"   a="0.0007"   b="-0.018"  c="0" />
-            <distortion model="ptlens" focal="7.4"   a="0.0005"   b="-0.014"  c="0" />
-            <distortion model="ptlens" focal="7.9"   a="0.00031"  b="-0.013"  c="0" />
-            <distortion model="ptlens" focal="8.8"   a="0.00007"  b="-0.01"   c="0" />
-            <distortion model="ptlens" focal="9.3"   a="0.00007"  b="-0.0087" c="0" />
-            <distortion model="ptlens" focal="10.2"  a="0.00007"  b="-0.0082" c="0" />
-            <distortion model="ptlens" focal="11.1"  a="0.00006"  b="-0.0076" c="0" />
-            <distortion model="ptlens" focal="12.1"  a="0.00005"  b="-0.0059" c="0" />
-            <distortion model="ptlens" focal="12.8" a="-0.00002"  b="-0.0058" c="0" />
+            <distortion model="ptlens" focal="5.1" a="-0.003959" b="0.004736" c="-0.081302" />
+            <distortion model="ptlens" focal="5.4" a="-0.005553" b="0.009049" c="-0.077906" />
+            <distortion model="ptlens" focal="5.9" a="0.011732" b="-0.066315" c="0.029221" />
+            <distortion model="ptlens" focal="6.3" a="-0.008619" b="0.017573" c="-0.069065" />
+            <distortion model="ptlens" focal="6.8" a="-0.012256" b="0.036251" c="-0.088407" />
+            <distortion model="ptlens" focal="7.4" a="0.009106" b="-0.048429" c="0.022523" />
+            <distortion model="ptlens" focal="7.9" a="0.000603" b="-0.027831" c="0.020523" />
+            <distortion model="ptlens" focal="8.8" a="-0.018814" b="0.059370" c="-0.092180" />
+            <distortion model="ptlens" focal="9.3" a="-0.001016" b="-0.010300" c="-0.001994" />
+            <distortion model="ptlens" focal="10.2" a="-0.017673" b="0.055682" c="-0.082869" />
+            <distortion model="ptlens" focal="11.1" a="-0.011262" b="0.038785" c="-0.068040" />
+            <distortion model="ptlens" focal="12.1" a="-0.011262" b="0.038785" c="-0.068040" />
+            <distortion model="ptlens" focal="12.8" a="-0.011262" b="0.038785" c="-0.068040" />
         </calibration>
     </lens>
 
Index: db/slr-olympus.xml
===================================================================
--- db/slr-olympus.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-olympus.xml	(.../trunk/data)	(Revision 157)
@@ -14,7 +14,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-400</model>
+        <model>E-300</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -22,7 +22,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-410</model>
+        <model>E-330</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -30,7 +30,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-420</model>
+        <model>E-400</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -38,7 +38,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-450</model>
+        <model>E-410</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -46,7 +46,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-500</model>
+        <model>E-420</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -54,7 +54,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-510</model>
+        <model>E-450</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -62,7 +62,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-520</model>
+        <model>E-500</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -70,7 +70,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-620</model>
+        <model>E-510</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -78,7 +78,7 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-330</model>
+        <model>E-520</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
@@ -86,23 +86,15 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-300</model>
+        <model>E-620</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>
 
     <camera>
-        <maker>OLYMPUS CORPORATION</maker>
-        <maker lang="en">Olympus</maker>
-        <model>E-1</model>
-        <mount>4/3 System</mount>
-        <cropfactor>2.0</cropfactor>
-    </camera>
-
-    <camera>
         <maker>OLYMPUS OPTICAL CO.,LTD</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-20,E-20N,E-20P</model>
+        <model>E-10</model>
         <mount>olympusE10</mount>
         <cropfactor>3.933</cropfactor>
     </camera>
@@ -110,7 +102,7 @@
     <camera>
         <maker>OLYMPUS OPTICAL CO.,LTD</maker>
         <maker lang="en">Olympus</maker>
-        <model>E-10</model>
+        <model>E-20,E-20N,E-20P</model>
         <mount>olympusE10</mount>
         <cropfactor>3.933</cropfactor>
     </camera>
@@ -124,6 +116,14 @@
     </camera>
 
     <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-1</model>
+        <mount>4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
         <model>E-3</model>
@@ -131,6 +131,14 @@
         <cropfactor>2.0</cropfactor>
     </camera>
 
+    <camera>
+        <maker>OLYMPUS IMAGING CORP.</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-5</model>
+        <mount>4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
     <lens>
         <maker>Olympus</maker>
         <model>Zuiko Digital 7-14mm f/4.0</model>
Index: db/mil-sony.xml
===================================================================
--- db/mil-sony.xml	(.../tags/0.2.5/data)	(Revision 0)
+++ db/mil-sony.xml	(.../trunk/data)	(Revision 157)
@@ -0,0 +1,55 @@
+<lensdatabase>
+
+    <mount>
+        <name>Sony E</name>
+        <compat>Sony Alpha</compat>
+        <compat>Minolta AF</compat>
+        <compat>Generic</compat>
+    </mount>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>NEX-3</model>
+        <model lang="en">NEX 3</model>
+        <mount>Sony E</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>NEX-5</model>
+        <model lang="en">NEX 5</model>
+        <mount>Sony E</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>NEX-C3</model>
+        <model lang="en">NEX C3</model>
+        <mount>Sony E</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>NEX-5N</model>
+        <model lang="en">NEX 5N</model>
+        <mount>Sony E</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>NEX-7</model>
+        <model lang="en">NEX 7</model>
+        <mount>Sony E</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+</lensdatabase>
Index: db/slr-nikon.xml
===================================================================
--- db/slr-nikon.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-nikon.xml	(.../trunk/data)	(Revision 157)
@@ -156,6 +156,24 @@
     <camera>
         <maker>NIKON CORPORATION</maker>
         <maker lang="en">Nikon</maker>
+        <model>NIKON D800</model>
+        <model lang="en">D800</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
+        <model>NIKON D800E</model>
+        <model lang="en">D800E</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
         <model>NIKON D3000</model>
         <model lang="en">D3000</model>
         <mount>Nikon F AF</mount>
@@ -165,6 +183,15 @@
     <camera>
         <maker>NIKON CORPORATION</maker>
         <maker lang="en">Nikon</maker>
+        <model>NIKON D3100</model>
+        <model lang="en">D3100</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
         <model>NIKON D5000</model>
         <model lang="en">D5000</model>
         <mount>Nikon F AF</mount>
@@ -174,6 +201,24 @@
     <camera>
         <maker>NIKON CORPORATION</maker>
         <maker lang="en">Nikon</maker>
+        <model>NIKON D5100</model>
+        <model lang="en">D5100</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
+        <model>NIKON D7000</model>
+        <model lang="en">D7000</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
         <model>NIKON D1</model>
         <model lang="en">D1</model>
         <mount>Nikon F AF</mount>
@@ -262,10 +307,19 @@
     </camera>
 
     <camera>
+        <maker>NIKON CORPORATION</maker>
+        <maker lang="en">Nikon</maker>
+        <model>NIKON D4</model>
+        <model lang="en">D4</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.0</cropfactor>
+    </camera>
+
+    <camera>
         <maker>FUJIFILM</maker>
         <maker lang="en">Fujifilm</maker>
-        <model>FinePix S5Pro</model>
-        <model lang="en">FinePix S5 Pro</model>
+        <model>FinePixS1Pro</model>
+        <model lang="en">FinePix S1 Pro</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
     </camera>
@@ -273,8 +327,8 @@
     <camera>
         <maker>FUJIFILM</maker>
         <maker lang="en">Fujifilm</maker>
-        <model>FinePix S3Pro</model>
-        <model lang="en">FinePix S3 Pro</model>
+        <model>FinePixS2Pro</model>
+        <model lang="en">FinePix S2 Pro</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
     </camera>
@@ -282,8 +336,8 @@
     <camera>
         <maker>FUJIFILM</maker>
         <maker lang="en">Fujifilm</maker>
-        <model>FinePixS2Pro</model>
-        <model lang="en">FinePix S2 Pro</model>
+        <model>FinePix S3Pro</model>
+        <model lang="en">FinePix S3 Pro</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
     </camera>
@@ -291,30 +345,30 @@
     <camera>
         <maker>FUJIFILM</maker>
         <maker lang="en">Fujifilm</maker>
-        <model>FinePixS1Pro</model>
-        <model lang="en">FinePix S1 Pro</model>
+        <model>FinePix S5Pro</model>
+        <model lang="en">FinePix S5 Pro</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
     </camera>
 
     <camera>
         <maker>Kodak</maker>
-        <model>DCS Pro 14N</model>
-        <variant>DCS-14n</variant>
+        <model>DCS Pro SLR/n</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.0</cropfactor>
     </camera>
 
     <camera>
         <maker>Kodak</maker>
-        <model>DCS Pro SLR/n</model>
+        <model>DCS Pro 14nx</model>
         <mount>Nikon F AF</mount>
         <cropfactor>1.0</cropfactor>
     </camera>
 
     <camera>
         <maker>Kodak</maker>
-        <model>DCS Pro 14nx</model>
+        <model>DCS Pro 14N</model>
+        <variant>DCS-14n</variant>
         <mount>Nikon F AF</mount>
         <cropfactor>1.0</cropfactor>
     </camera>
@@ -976,4 +1030,45 @@
         </calibration>
     </lens>
 
+    <lens>
+        <maker>Nikon</maker>
+        <model>Nikon Nikkor 35mm f/1.8G AF-S DX</model>
+        <mount>Nikon F AF</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="35" a="-0.00899" b="0.02507" c="-0.04009" />
+        </calibration>
+    </lens>
+
+    <lens> <!-- http://developer.berlios.de/patch/index.php?func=detailpatch&patch_id=3047&group_id=9034 -->
+        <maker>Nikon</maker>
+        <model>Nikon AF Nikkor 50mm f/1.8D</model>
+        <mount>Nikon F AF</mount>
+        <focal>50</focal>
+        <aperture>1.8-22</aperture>
+        <type>rectilinear</type>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="50.0" a="-0.00255" b="0.00841" c="-0.01107" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Nikon</maker>
+        <model>Nikon AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED</model>
+        <mount>Nikon F AF</mount>
+        <focal>18-105</focal>
+        <aperture>3.5-22</aperture>
+        <type>rectilinear</type>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="18.0" a="0.00529" b="-0.02091" c="-0.01697" />
+            <distortion model="ptlens" focal="25.0" a="0.01542" b="-0.03457" c="0.02371" />
+            <distortion model="ptlens" focal="35.0" a="0.00716" b="-0.00354" c="0.00352" />
+            <distortion model="ptlens" focal="50.0" a="0.00477" b="-0.00182" c="0.00982" />
+            <distortion model="ptlens" focal="75.0" a="-0.0024" b="0.02231" c="-0.01516" />
+            <distortion model="ptlens" focal="105.0" a="0.00392" b="-0.00253" c="0.01061" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/compact-canon.xml
===================================================================
--- db/compact-canon.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/compact-canon.xml	(.../trunk/data)	(Revision 157)
@@ -16,12 +16,17 @@
     </mount>
 
     <mount>
+        <name>canonG7</name>
+        <compat>Generic</compat>
+    </mount>
+
+    <mount>
         <name>canonG9</name>
         <compat>Generic</compat>
     </mount>
 
     <mount>
-        <name>canonG11</name>
+        <name>canonG10</name>
         <compat>Generic</compat>
     </mount>
 
@@ -31,6 +36,11 @@
     </mount>
 
     <mount>
+        <name>canonG12</name>
+        <compat>Generic</compat>
+    </mount>
+
+    <mount>
         <name>canonSD500</name>
         <compat>Generic</compat>
     </mount>
@@ -130,6 +140,11 @@
         <compat>Generic</compat>
     </mount>
 
+    <mount>
+        <name>canonA650IS</name>
+        <compat>Generic</compat>
+    </mount>
+
     <camera>
         <maker>Canon</maker>
         <model>Canon PowerShot Pro1</model>
@@ -188,6 +203,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon PowerShot G7</model>
+        <model lang="en">PowerShot G7</model>
+        <mount>canonG7</mount>
+        <cropfactor>4.843</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon PowerShot G9</model>
         <model lang="en">PowerShot G9</model>
         <mount>canonG9</mount>
@@ -212,6 +235,14 @@
 
     <camera>
         <maker>Canon</maker>
+        <model>Canon PowerShot G12</model>
+        <model lang="en">PowerShot G12</model>
+        <mount>canonG12</mount>
+        <cropfactor>4.63</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>Canon</maker>
         <model>Canon PowerShot SD550</model>
         <model lang="en">PowerShot SD550</model>
         <mount>canonSD500</mount>
@@ -720,6 +751,14 @@
         <cropfactor>1.6</cropfactor>
     </camera>
 
+    <camera>
+        <maker>Canon</maker>
+        <model>Canon PowerShot A650 IS</model>
+        <model lang="en">PowerShot A650 IS</model>
+        <mount>canonA650IS</mount>
+        <cropfactor>4.67712</cropfactor>
+    </camera>
+
     <lens>
         <maker>Canon</maker>
         <model>Standard</model>
@@ -819,6 +858,23 @@
     <lens>
         <maker>Canon</maker>
         <model>Standard</model>
+        <mount>canonG12</mount>
+        <cropfactor>4.63</cropfactor>
+        <calibration>
+            <distortion model="poly5" focal="6.1" k1="-0.030571633" k2="0.004658548" />
+            <distortion model="poly5" focal="8.108" k1="-0.015375784" k2="0.001669650" />
+            <distortion model="poly5" focal="12.074" k1="-0.010041248" k2="-0.001118356" />
+            <distortion model="poly5" focal="18.098" k1="-0.002054377" k2="0.000011075" />
+            <distortion model="poly5" focal="30.5" k1="-0.000323237" k2="-0.000346917" />
+            <tca model="poly3" focal="6.1" br="-0.0002616" vr="1.0007448" bb="-0.0000455" vb="1.0003314" />
+            <tca model="poly3" focal="10.8" br="-0.0000003" vr="1.0004612" bb="0.0000253" vb="1.0001464" />
+            <tca model="poly3" focal="30.5" br="0.0000326" vr="0.9996400" bb="-0.0003242" vb="1.0008367" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Canon</maker>
+        <model>Standard</model>
         <mount>canonSD500</mount>
         <cropfactor>4.8</cropfactor>
         <calibration>
@@ -1159,4 +1215,20 @@
         </calibration>
     </lens>
 
+    <lens>
+        <maker>Canon</maker>
+        <model>Standard</model>
+        <mount>canonA650IS</mount>
+        <cropfactor>4.67712</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="7.4" a="0.02" b="-0.06" c="0.021" />
+            <distortion model="ptlens" focal="9" a="0.021" b="-0.045" c="0.022" />
+            <distortion model="ptlens" focal="10.7" a="-0.013" b="0.036" c="-0.036" />
+            <distortion model="ptlens" focal="14.8" a="0.007" b="-0.012" c="0.003" />
+            <distortion model="ptlens" focal="18.9" a="-0.002" b="0.02" c="-0.027" />
+            <distortion model="ptlens" focal="25" a="-0.004" b="0.013" c="-0.009" />
+            <distortion model="ptlens" focal="44.4" a="0.002" b="0.008" c="-0.005" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/slr-tokina.xml
===================================================================
--- db/slr-tokina.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-tokina.xml	(.../trunk/data)	(Revision 157)
@@ -4,7 +4,7 @@
         <maker>Tokina</maker>
         <model>Tokina 12-24mm f/4 AT-X 124 AF PRO DX</model>
         <mount>Canon EF</mount>
-        <mount>Nikon AF</mount>
+        <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
         <calibration>
             <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0" />
@@ -21,7 +21,7 @@
         <maker>Tokina</maker>
         <model>Tokina 19-35mm f/3.5-4.5 AF 193</model>
         <mount>Canon EF</mount>
-        <mount>Nikon AF</mount>
+        <mount>Nikon F AF</mount>
         <cropfactor>1.6</cropfactor>
         <calibration>
             <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162" />
@@ -39,7 +39,7 @@
         <maker>Tokina</maker>
         <model>Tokina 28-70mm f/2.8 AT-X 287 PRO SV</model>
         <mount>Canon EF</mount>
-        <mount>Nikon AF</mount>
+        <mount>Nikon F AF</mount>
         <mount>Pentax KAF</mount>
         <cropfactor>1.6</cropfactor>
         <calibration>
@@ -54,9 +54,26 @@
 
     <lens>
         <maker>Tokina</maker>
+        <model>Tokina 80-200mm f/4.5-5.6 SZ-X</model>
+        <mount>Canon EF</mount>
+        <mount>Nikon F AF</mount>
+        <mount>Pentax KAF</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="80" a="-0.01761" b="0.06433" c="-0.07566" />
+            <distortion model="ptlens" focal="110" a="-0.01579" b="0.05909" c="-0.06129" />
+            <distortion model="ptlens" focal="200" a="-0.01328" b="0.04681" c="-0.03935" />
+            <tca model="poly3" focal="80" br="0.0000351" vr="0.9998083" bb="-0.0000109" vb="0.9998991" />
+            <tca model="poly3" focal="110" br="-0.0000155" vr="0.9999253" bb="-0.0000348" vb="0.9994977" />
+            <tca model="poly3" focal="200" br="-0.0000075" vr="0.9993965" bb="-0.0000782" vb="0.9994524" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Tokina</maker>
         <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
         <mount>Canon EF</mount>
-        <mount>Nikon AF</mount>
+        <mount>Nikon F AF</mount>
         <cropfactor>1.5</cropfactor>
         <calibration>
             <distortion model="ptlens" focal="17" a="0" b="-0.012125" c="0" />
@@ -67,7 +84,7 @@
         <maker>Tokina</maker>
         <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
         <mount>Canon EF</mount>
-        <mount>Nikon AF</mount>
+        <mount>Nikon F AF</mount>
         <cropfactor>1.6</cropfactor>
         <calibration>
             <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672" />
Index: db/slr-sony.xml
===================================================================
--- db/slr-sony.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-sony.xml	(.../trunk/data)	(Revision 157)
@@ -10,6 +10,51 @@
     <camera>
         <maker>SONY</maker>
         <maker lang="en">Sony</maker>
+        <model>SLT-A33</model>
+        <model lang="en">Alpha 33</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>SLT-A35</model>
+        <model lang="en">Alpha 35</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>SLT-A55V</model>
+        <model lang="en">Alpha 55</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>SLT-A65V</model>
+        <model lang="en">Alpha 65</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>SLT-A77V</model>
+        <model lang="en">Alpha 77</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
         <model>DSLR-A100</model>
         <model lang="en">Alpha 100</model>
         <mount>Sony Alpha</mount>
@@ -37,6 +82,15 @@
     <camera>
         <maker>SONY</maker>
         <maker lang="en">Sony</maker>
+        <model>DSLR-A290</model>
+        <model lang="en">Alpha 290</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
         <model>DSLR-A300</model>
         <model lang="en">Alpha 300</model>
         <mount>Sony Alpha</mount>
@@ -73,6 +127,24 @@
     <camera>
         <maker>SONY</maker>
         <maker lang="en">Sony</maker>
+        <model>DSLR-A390</model>
+        <model lang="en">Alpha 390</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>DSLR-A450</model>
+        <model lang="en">Alpha 450</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
         <model>DSLR-A500</model>
         <model lang="en">Alpha 500</model>
         <mount>Sony Alpha</mount>
@@ -91,6 +163,24 @@
     <camera>
         <maker>SONY</maker>
         <maker lang="en">Sony</maker>
+        <model>DSLR-A560</model>
+        <model lang="en">Alpha 560</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
+        <model>DSLR-A580</model>
+        <model lang="en">Alpha 580</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>SONY</maker>
+        <maker lang="en">Sony</maker>
         <model>DSLR-A700</model>
         <model lang="en">Alpha 700</model>
         <mount>Sony Alpha</mount>
@@ -115,4 +205,113 @@
         <cropfactor>1.5</cropfactor>
     </camera>
 
+    <!-- That one is done on a cropi 1.5 cam. It should be replaced by a calibration with full format -->
+    <lens>
+        <maker>Sony</maker>
+        <model>Sony 50 mm F1.4 SAL 50F14</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly5" focal="50" k1="-0.003782"  k2="-0.000003" />
+
+            <tca model="poly3" focal="50" br="-0.0000170" vr="1.0002353" bb="0.0000836" vb="0.9996309" />
+
+            <vignetting model="pa" focal="50.000000" aperture="1.400000" distance="5.000000" k1="-0.301317" k2="0.131668" k3="-0.068295" />
+            <vignetting model="pa" focal="50.000000" aperture="2.000000" distance="5.000000" k1="-0.094064" k2="0.183463" k3="-0.160173" />
+            <vignetting model="pa" focal="50.000000" aperture="2.800000" distance="5.000000" k1="-0.046364" k2="0.024316" k3="-0.014513" />
+            <vignetting model="pa" focal="50.000000" aperture="3.500000" distance="5.000000" k1="-0.062148" k2="0.049874" k3="-0.019353" />
+            <vignetting model="pa" focal="50.000000" aperture="5.000000" distance="5.000000" k1="-0.070057" k2="0.065284" k3="-0.036651" />
+            <vignetting model="pa" focal="50.000000" aperture="8.000000" distance="5.000000" k1="-0.059283" k2="0.024786" k3="-0.003931" />
+            <vignetting model="pa" focal="50.000000" aperture="16.000000" distance="5.000000" k1="-0.072308" k2="0.080953" k3="-0.051882" />
+            <vignetting model="pa" focal="50.000000" aperture="22.000000" distance="5.000000" k1="-0.080270" k2="0.101158" k3="-0.067876" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Sony</maker>
+        <model>Sony AF DT 16-105 mm F3.5-5.6 |Sony AF DT 55-200mm</model>
+        <mount>Sony Alpha</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <tca model="poly3" focal="16" br="0.0000849" vr="1.0002242" bb="0.0002099" vb="1.0007851" />
+            <tca model="poly3" focal="24" br="0.0001033" vr="1.0002142" bb="-0.0001268" vb="1.0003659" />
+            <tca model="poly3" focal="35" br="0.0000673" vr="1.0001269" bb="-0.0001984" vb="1.0001409" />
+            <tca model="poly3" focal="50" br="-0.0000401" vr="0.9998721" bb="-0.0001637" vb="1.0001459" />
+            <tca model="poly3" focal="75" br="0.0000190" vr="0.9997211" bb="-0.0002164" vb="1.0000605" />
+            <tca model="poly3" focal="105" br="0.0001368" vr="0.9992983" bb="-0.0002385" vb="1.0001643" />
+
+            <!-- distortion poly3 with hugin -->
+            <!-- distortion model="poly3" focal="16" k1="-0.025" / -->
+            <!-- distortion model="poly3" focal="22" k1="-0.005" / -->
+            <!-- distortion model="poly3" focal="35" k1="-0.007" / -->
+            <!-- distortion model="poly3" focal="50" k1="-0.008" / -->
+            <!-- distortion model="poly3" focal="70" k1="0.007" / -->
+
+            <!-- distortion ptlens with hugin -->
+            <!-- distortion model="ptlens" focal="16" a="0.030" b="-0.080" c="0.026" / -->
+            <!-- distortion model="ptlens" focal="22" a="0.011" b="-0.024" c="0.009" / -->
+            <!-- distortion model="ptlens" focal="35" a="0.006" b="-0.003" c="-0.002" / -->
+            <!-- distortion model="ptlens" focal="50" a="0.003" b="-0.003" c="0.010" / -->
+            <!-- distortion model="ptlens" focal="70" a="0.002" b="0.003" c="0.003" / -->
+            <!-- distortion model="ptlens" focal="105" a="-0.001" b="0.010" c="-0.004" / -->
+
+            <!-- distortion with OpenCV -->
+            <distortion model="poly5" focal="16" k1="-0.032364"  k2="0.004780" />
+            <distortion model="poly5" focal="24" k1="-0.009351"  k2="0.002502" />
+            <distortion model="poly5" focal="35" k1="0.000617"  k2="0.001124" />
+            <distortion model="poly5" focal="50" k1="0.004351"  k2="0.000318" />        
+            <distortion model="poly5" focal="70" k1="0.006456"  k2="0.000162" />
+            <distortion model="poly5" focal="105" k1="0.006115"  k2="0.000015" />
+
+            <vignetting model="pa" focal="16" aperture="3.5" distance="5" k1="-0.288470" k2="0.374699" k3="-0.523764" />
+            <vignetting model="pa" focal="16" aperture="4" distance="5" k1="-0.330235" k2="0.497285" k3="-0.583721" />
+            <vignetting model="pa" focal="16" aperture="4.5" distance="5" k1="-0.336407" k2="0.552643" k3="-0.575818" />
+            <vignetting model="pa" focal="16" aperture="5" distance="5" k1="-0.353798" k2="0.602097" k3="-0.578792" />
+            <vignetting model="pa" focal="16" aperture="5.6" distance="5" k1="-0.312894" k2="0.427975" k3="-0.374015" />
+            <vignetting model="pa" focal="16" aperture="8" distance="5" k1="-0.228501" k2="0.134331" k3="-0.103199" />
+            <vignetting model="pa" focal="16" aperture="16" distance="5" k1="-0.202748" k2="0.056228" k3="-0.049107" />
+            <vignetting model="pa" focal="16" aperture="22" distance="5" k1="-0.201659" k2="0.060327" k3="-0.049851" />
+            <vignetting model="pa" focal="24" aperture="4.5" distance="5" k1="-0.308582" k2="0.589818" k3="-0.521015" />
+            <vignetting model="pa" focal="24" aperture="5" distance="5" k1="-0.274235" k2="0.476290" k3="-0.393271" />
+            <vignetting model="pa" focal="24" aperture="5.6" distance="5" k1="-0.229792" k2="0.330459" k3="-0.263460" />
+            <vignetting model="pa" focal="24" aperture="8" distance="5" k1="-0.186426" k2="0.164882" k3="-0.107059" />
+            <vignetting model="pa" focal="24" aperture="16" distance="5" k1="-0.154042" k2="0.076936" k3="-0.033692" />
+            <vignetting model="pa" focal="24" aperture="22" distance="5" k1="-0.114423" k2="-0.002908" k3="0.015035" />
+            <vignetting model="pa" focal="24" aperture="25" distance="5" k1="-0.124935" k2="-0.005534" k3="0.024066" />
+            <vignetting model="pa" focal="35" aperture="5" distance="5" k1="-0.287485" k2="0.650777" k3="-0.550081" />
+            <vignetting model="pa" focal="35" aperture="5.6" distance="5" k1="-0.260832" k2="0.554374" k3="-0.457173" />
+            <vignetting model="pa" focal="35" aperture="8" distance="5" k1="-0.182410" k2="0.293890" k3="-0.226888" />
+            <vignetting model="pa" focal="35" aperture="16" distance="5" k1="-0.133782" k2="0.163862" k3="-0.120876" />
+            <vignetting model="pa" focal="35" aperture="22" distance="5" k1="-0.120685" k2="0.122561" k3="-0.089933" />
+            <vignetting model="pa" focal="35" aperture="32" distance="5" k1="-0.105005" k2="0.097940" k3="-0.083067" />
+            <vignetting model="pa" focal="50" aperture="5" distance="5" k1="-0.258488" k2="0.647112" k3="-0.571874" />
+            <vignetting model="pa" focal="50" aperture="5.6" distance="5" k1="-0.241527" k2="0.610572" k3="-0.549893" />
+            <vignetting model="pa" focal="50" aperture="8" distance="5" k1="-0.204291" k2="0.428393" k3="-0.337452" />
+            <vignetting model="pa" focal="50" aperture="16" distance="5" k1="-0.131377" k2="0.216608" k3="-0.160456" />
+            <vignetting model="pa" focal="50" aperture="22" distance="5" k1="-0.139891" k2="0.251957" k3="-0.188303" />
+            <vignetting model="pa" focal="50" aperture="32" distance="5" k1="-0.131371" k2="0.232205" k3="-0.179864" />
+            <vignetting model="pa" focal="55" aperture="5.6" distance="5" k1="-0.254949" k2="0.648429" k3="-0.575154" />
+            <vignetting model="pa" focal="55" aperture="8" distance="5" k1="-0.211558" k2="0.458632" k3="-0.357524" />
+            <vignetting model="pa" focal="55" aperture="22" distance="5" k1="-0.135846" k2="0.253241" k3="-0.185327" />
+            <vignetting model="pa" focal="55" aperture="32" distance="5" k1="-0.145348" k2="0.292481" k3="-0.221538" />
+            <vignetting model="pa" focal="70" aperture="5.6" distance="5" k1="-0.240167" k2="0.681320" k3="-0.676884" />
+            <vignetting model="pa" focal="70" aperture="8" distance="5" k1="-0.260742" k2="0.701911" k3="-0.610079" />
+            <vignetting model="pa" focal="70" aperture="16" distance="5" k1="-0.145886" k2="0.281155" k3="-0.204221" />
+            <vignetting model="pa" focal="70" aperture="22" distance="5" k1="-0.129192" k2="0.255130" k3="-0.188194" />
+            <vignetting model="pa" focal="70" aperture="32" distance="5" k1="-0.139201" k2="0.293529" k3="-0.223242" />
+            <vignetting model="pa" focal="80" aperture="5.6" distance="5" k1="-0.210133" k2="0.592325" k3="-0.609250" />
+            <vignetting model="pa" focal="80" aperture="8" distance="5" k1="-0.238492" k2="0.624078" k3="-0.538598" />
+            <vignetting model="pa" focal="80" aperture="16" distance="5" k1="-0.132754" k2="0.243649" k3="-0.169231" />
+            <vignetting model="pa" focal="80" aperture="22" distance="5" k1="-0.120105" k2="0.212296" k3="-0.146781" />
+            <vignetting model="pa" focal="80" aperture="32" distance="5" k1="-0.134805" k2="0.284222" k3="-0.209818" />
+            <vignetting model="pa" focal="80" aperture="36" distance="5" k1="-0.139841" k2="0.297199" k3="-0.219408" />
+            <vignetting model="pa" focal="105" aperture="5.6" distance="5" k1="-0.175601" k2="0.457244" k3="-0.494756" />
+            <vignetting model="pa" focal="105" aperture="8" distance="5" k1="-0.216160" k2="0.548847" k3="-0.471725" />
+            <vignetting model="pa" focal="105" aperture="16" distance="5" k1="-0.125322" k2="0.199554" k3="-0.120266" />
+            <vignetting model="pa" focal="105" aperture="22" distance="5" k1="-0.108959" k2="0.161971" k3="-0.093471" />
+            <vignetting model="pa" focal="105" aperture="32" distance="5" k1="-0.133615" k2="0.270073" k3="-0.183446" />
+            <vignetting model="pa" focal="105" aperture="36" distance="5" k1="-0.150555" k2="0.308926" k3="-0.206299" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/mil-olympus.xml
===================================================================
--- db/mil-olympus.xml	(.../tags/0.2.5/data)	(Revision 0)
+++ db/mil-olympus.xml	(.../trunk/data)	(Revision 157)
@@ -0,0 +1,187 @@
+<lensdatabase>
+
+    <mount>
+        <name>Micro 4/3 System</name>
+        <compat>M42</compat>
+        <compat>Generic</compat>
+        <compat>4/3 System</compat>
+    </mount>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-P1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-P2</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-P3</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-PL1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-PL1s</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-PL2</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-PL3</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-PM1</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>OLYMPUS CORPORATION</maker>
+        <maker lang="en">Olympus</maker>
+        <model>E-M5</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+    </camera>
+
+    <lens>
+        <maker>Olympus</maker>
+        <model>OLYMPUS M.14-42mm F3.5-5.6</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="14" k1="-0.079" />
+            <distortion model="poly3" focal="18" k1="-0.036" />
+            <distortion model="poly3" focal="25" k1="0.0004" />
+            <distortion model="poly3" focal="30" k1="0.013" />
+            <distortion model="poly3" focal="35" k1="0.014" />
+            <distortion model="poly3" focal="42" k1="0.012" />
+            <tca model="poly3" focal="14" br="0.0002632" vr="1.0002908" bb="-0.0003817" vb="1.0" />
+            <tca model="poly3" focal="18" br="-0.0000326" vr="1.0004544" bb="-0.0003189" vb="1.0007081" />
+            <tca model="poly3" focal="25" br="-0.0001613" vr="1.0005611" bb="-0.0001126" vb="1.0004058" />
+            <tca model="poly3" focal="30" br="-0.0002418" vr="1.0006295" bb="-0.0000052" vb="1.0002145" />
+            <tca model="poly3" focal="35" br="-0.0002539" vr="1.0006484" bb="0.0000470" vb="1.0000846" />
+            <tca model="poly3" focal="42" br="-0.0002029" vr="1.0006187" bb="0.0001236" vb="0.9999271" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Olympus</maker>
+        <model>OLYMPUS M.14-42mm F3.5-5.6 L</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <tca model="poly3" focal="14" br="0.0000600" vr="1.0001242" bb="-0.0002995" vb="1.0007041" />
+            <tca model="poly3" focal="18" br="0.0001267" vr="1.0000281" bb="-0.0001852" vb="1.0007117" />
+            <tca model="poly3" focal="25" br="-0.0000200" vr="1.0001315" bb="0.0001459" vb="1.0002999" />
+            <tca model="poly3" focal="35" br="-0.0001014" vr="1.0002742" bb="0.0000318" vb="1.0002395" />
+            <tca model="poly3" focal="42" br="-0.0001526" vr="1.0004259" bb="0.0001596" vb="1.0000256" />
+            <distortion model="ptlens" focal="13.56" a="0.10558" b="-0.3175" c="0.19816" />
+            <distortion model="ptlens" focal="16.49" a="0.0738" b="-0.25191" c="0.21409" />
+            <distortion model="ptlens" focal="24.40" a="-0.01895" b="0.05672" c="-0.05355" />
+            <distortion model="ptlens" focal="34.28" a="0.00451" b="-0.00716" c="0.02727" />
+            <distortion model="ptlens" focal="41.01" a="-0.00173" b="0.01774" c="0.00339" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Olympus</maker>
+	<model>OLYMPUS M.14-42mm F3.5-5.6 II</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
+            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
+            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
+            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
+            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
+            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
+            <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
+            <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
+            <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
+            <tca model="poly3" focal="30" br="-0.0000429" vr="1.0002040" bb="0.0000872" vb="1.0002187"/>
+            <tca model="poly3" focal="35" br="-0.0001262" vr="1.0003653" bb="-0.0000270" vb="1.0003605"/>
+            <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Olympus</maker>
+        <model>OLYMPUS M.14-42mm F3.5-5.6 II R</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="14" a="0.018" b="-0.074" c="0.014" />
+            <distortion model="ptlens" focal="18" a="0.011" b="-0.048" c="0.021" />
+            <distortion model="ptlens" focal="25" a="0.0" b="-0.012" c="0.008" />
+            <distortion model="ptlens" focal="30" a="0.007" b="-0.015" c="0.003" />
+            <distortion model="ptlens" focal="35" a="0.007" b="-0.021" c="0.018" />
+            <distortion model="ptlens" focal="42" a="-0.001" b="0.008" c="-0.010" />
+            <tca model="poly3" focal="14" br="0.0000882" vr="1.0001828" bb="0.0002104" vb="1.0004280"/>
+            <tca model="poly3" focal="18" br="0.0000087" vr="1.0000985" bb="-0.0001260" vb="1.0002535"/>
+            <tca model="poly3" focal="25" br="-0.0000210" vr="1.0001388" bb="-0.0001294" vb="1.0005537"/>
+            <tca model="poly3" focal="30" br="-0.0000429" vr="1.0002040" bb="0.0000872" vb="1.0002187"/>
+            <tca model="poly3" focal="35" br="-0.0001262" vr="1.0003653" bb="-0.0000270" vb="1.0003605"/>
+            <tca model="poly3" focal="42" br="-0.0000752" vr="1.0003152" bb="-0.0000213" vb="1.0001196"/>
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Olympus</maker>
+        <model>OLYMPUS M.12mm F2.0</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <focal value="12" />
+        <calibration>
+            <distortion model="ptlens" focal="12" a="-0.005" b="-0.016" c="-0.014" />
+            <tca model="poly3" focal="12" br="0.0000749" vr="1.0001239" bb="0.0000350" vb="1.0000181" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Olympus</maker>
+        <model>OLYMPUS M.17mm F2.8</model>
+        <mount>Micro 4/3 System</mount>
+        <cropfactor>2.0</cropfactor>
+        <calibration>
+             <distortion model="ptlens" focal="17" a="0.00835" b="-0.04149" c="-0.0022" />
+             <tca model="poly3" focal="17" br="-0.0004492" vr="1.0016410" bb="0.0005749" vb="0.9989794" />
+        </calibration>
+    </lens>
+
+</lensdatabase>

Eigenschaftsänderungen: db/mil-olympus.xml
___________________________________________________________________
Hinzugefügt: svn:eol-style
   + native

Index: db/compact-olympus.xml
===================================================================
--- db/compact-olympus.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/compact-olympus.xml	(.../trunk/data)	(Revision 157)
@@ -56,11 +56,6 @@
     </mount>
 
     <mount>
-        <name>olympusEP1</name>
-        <compat>Generic</compat>
-    </mount>
-
-    <mount>
         <name>olympusSP350</name>
         <compat>Generic</compat>
     </mount>
@@ -229,14 +224,6 @@
     <camera>
         <maker>OLYMPUS IMAGING CORP.</maker>
         <maker lang="en">Olympus</maker>
-        <model>EP-1</model>
-        <mount>olympusEP1</mount>
-        <cropfactor>2.0</cropfactor>
-    </camera>
-
-    <camera>
-        <maker>OLYMPUS IMAGING CORP.</maker>
-        <maker lang="en">Olympus</maker>
         <model>SP350</model>
         <mount>olympusSP350</mount>
         <cropfactor>4.8</cropfactor>
Index: db/slr-pentax.xml
===================================================================
--- db/slr-pentax.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-pentax.xml	(.../trunk/data)	(Revision 157)
@@ -139,15 +139,6 @@
     <camera>
         <maker>PENTAX Corporation</maker>
         <maker lang="en">Pentax</maker>
-        <model>PENTAX K200D</model>
-        <model lang="en">K200D</model>
-        <mount>Pentax KAF2</mount>
-        <cropfactor>1.5</cropfactor>
-    </camera>
-
-    <camera>
-        <maker>PENTAX Corporation</maker>
-        <maker lang="en">Pentax</maker>
         <model>PENTAX K10D</model>
         <model lang="en">K10D</model>
         <mount>Pentax KAF2</mount>
@@ -175,6 +166,15 @@
     <camera>
         <maker>PENTAX</maker>
         <maker lang="en">Pentax</maker>
+        <model>PENTAX K-5</model>
+        <model lang="en">K-5</model>
+        <mount>Pentax KAF2</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
+    <camera>
+        <maker>PENTAX</maker>
+        <maker lang="en">Pentax</maker>
         <model>PENTAX K2000</model>
         <model lang="en">K2000</model>
         <mount>Pentax KAF3</mount>
@@ -199,8 +199,41 @@
         <cropfactor>1.5</cropfactor>
     </camera>
 
+    <camera>
+        <maker>PENTAX</maker>
+        <maker lang="en">Pentax</maker>
+        <model>PENTAX K-r</model>
+        <model lang="en">K-r</model>
+        <mount>Pentax KAF2</mount>
+        <cropfactor>1.5</cropfactor>
+    </camera>
+
     <lens>
         <maker>Pentax</maker>
+        <model>SMC PENTAX DA 12-24mm F/4 ED AL IF</model>
+        <mount>Pentax KAF2</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="12" k1="-0.01919" />
+            <distortion model="poly3" focal="15" k1="-0.00774" />
+            <distortion model="poly3" focal="18" k1="-0.00345" />
+            <distortion model="poly3" focal="21" k1="-0.00199" />
+            <distortion model="poly3" focal="24" k1="0.00061" />
+            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490" />
+            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241" />
+            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258" />
+            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692" />
+            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136" />
+            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938" />
+            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908" />
+            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039" />
+            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488" />
+            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
         <model>SMC Pentax DA 16-45mm f/4.0 ED AL</model>
         <mount>Pentax KAF2</mount>
         <cropfactor>1.5</cropfactor>
@@ -250,26 +283,137 @@
 
     <lens>
         <maker>Pentax</maker>
-        <model>SMC PENTAX DA 12-24mm F/4 ED AL IF</model>
+        <model>SMC PENTAX DA 55-300mm F/4-5.8 ED</model>
         <mount>Pentax KAF2</mount>
         <cropfactor>1.5</cropfactor>
         <calibration>
-            <distortion model="poly3" focal="12" k1="-0.01919" />
-            <distortion model="poly3" focal="15" k1="-0.00774" />
-            <distortion model="poly3" focal="18" k1="-0.00345" />
-            <distortion model="poly3" focal="21" k1="-0.00199" />
-            <distortion model="poly3" focal="24" k1="0.00061" />
-            <tca model="poly3" focal="12" br="0.0000916" vr="0.9999904" bb="-0.0002397" vb="1.0006490" />
-            <tca model="poly3" focal="15" br="0.0001253" vr="0.9999184" bb="-0.0002858" vb="1.0008241" />
-            <tca model="poly3" focal="18" br="0.0001204" vr="0.9999075" bb="-0.0001990" vb="1.0006258" />
-            <tca model="poly3" focal="21" br="0.0001063" vr="0.9999562" bb="-0.0001477" vb="1.0005692" />
-            <tca model="poly3" focal="24" br="0.0000982" vr="1.0000005" bb="-0.0001137" vb="1.0004136" />
-            <vignetting model="pa" focal="12" aperture="4.5" distance="100" k1="-0.19267" k2="0.09379" k3="-0.38938" />
-            <vignetting model="pa" focal="15" aperture="4.5" distance="100" k1="-0.08756" k2="-0.28192" k3="0.06908" />
-            <vignetting model="pa" focal="18" aperture="4.5" distance="100" k1="-0.05982" k2="-0.45748" k3="0.25039" />
-            <vignetting model="pa" focal="21" aperture="4.5" distance="100" k1="-0.28874" k2="-0.06687" k3="0.09488" />
-            <vignetting model="pa" focal="24" aperture="4.5" distance="100" k1="-0.44227" k2="0.2599" k3="-0.09436" />
+            <distortion model="ptlens" focal="55" a="-0.00518" b="0.01937" c="-0.02824" />
+            <distortion model="ptlens" focal="70" a="-0.00835" b="0.03291" c="-0.03127" />
+            <distortion model="ptlens" focal="100" a="-0.00192" b="0.0237" c="-0.02643" />
+            <distortion model="ptlens" focal="135" a="0.00299" b="0.00061" c="0.01078" />
+            <distortion model="ptlens" focal="210" a="-0.00376" b="0.02149" c="-0.01102" />
+            <distortion model="ptlens" focal="300" a="0.00076" b="0.00759" c="-0.00349" />
+            <tca model="poly3" focal="55" br="0.0000246" vr="1.0000974" bb="-0.0001380" vb="1.0004061" />
+            <tca model="poly3" focal="70" br="0.00003" vr="0.99993" bb="-0.00013" vb="1.00017" />
+            <tca model="poly3" focal="100" br="0.0000716" vr="0.9996644" bb="-0.0002294" vb="1.0001925" />
+            <tca model="poly3" focal="135" br="0.0000352" vr="0.9996857" bb="-0.0001704" vb="0.9999750" />
+            <tca model="poly3" focal="210" br="0.0000202" vr="0.9993629" bb="-0.0000804" vb="0.9992342" />
+            <tca model="poly3" focal="300" br="-0.0002627" vr="0.9998441" bb="-0.0002958" vb="0.9995492" />
         </calibration>
     </lens>
 
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC PENTAX DA 40mm F/2.8 Limited</model>
+        <mount>Pentax KAF2</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="40" k1="-0.00384" />
+            <tca model="poly3" focal="40" br="-0.0000230" vr="1.0001421" bb="0.0000150" vb="0.9999150" />
+            <vignetting model="pa" focal="40" aperture="11" distance="1000" k1="-0.17248" k2="0.21247" k3="-0.13119" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC PENTAX K 30mm F/2.8</model>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="30" k1="-0.00537" />
+            <tca model="poly3" focal="30" br="0.0000083" vr="1.0002" bb="0.00008" vb="0.99976" />
+            <vignetting model="pa" focal="30" aperture="11" distance="1000" k1="-0.36804" k2="0.318" k3="-0.18433" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>Takumar 135mm F/2.5 Bayonet</model>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="135" k1="0.00185" />
+            <tca model="poly3" focal="135" br="0.0000400" vr="0.999887" bb="-0.00012" vb="1.0002" />
+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.40098" k2="0.46402" k3="-0.26756" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC PENTAX M 50mm F/2</model>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="50" k1="-0.00239" />
+            <tca model="poly3" focal="50" br="0.0000100" vr="1.00005" bb="-0.0000100" vb="0.99974" />
+            <vignetting model="pa" focal="50" aperture="11" distance="1000" k1="-0.30738" k2="0.29474" k3="-0.16389" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC PENTAX M 150mm F/3.5</model>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3" focal="150" k1="0.00133" />
+            <tca model="poly3" focal="150" br="-0.00001" vr="0.9999" bb="-0.00005" vb="1.00007" />
+            <vignetting model="pa" focal="150" aperture="11" distance="1000" k1="-0.45436" k2="0.68491" k3="-0.48506" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC Pentax DA L 18-55mm f/3.5-5.6</model>
+        <mount>Pentax KAF2</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="ptlens" focal="18" a="0.00117" b="-0.01707" c="-0.00529" />
+            <distortion model="ptlens" focal="24" a="0" b="-0.0071" c="0" />
+            <distortion model="ptlens" focal="35" a="0" b="0.0002" c="0" />
+            <distortion model="ptlens" focal="42.5" a="0.00291" b="-0.00765" c="0.00808" />
+            <distortion model="ptlens" focal="55" a="0" b="0.00333" c="0" />
+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.26538" k2="0.5437" k3="-0.51036" />
+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.08271" k2="0.02282" k3="-0.04481" />
+            <vignetting model="pa" focal="35" aperture="11" distance="1000" k1="-0.05666" k2="0.02789" k3="-0.01283" />
+            <vignetting model="pa" focal="42.5" aperture="11" distance="1000" k1="-0.03675" k2="0.01041" k3="-0.00479" />
+            <vignetting model="pa" focal="55" aperture="11" distance="1000" k1="-0.07077" k2="0.07738" k3="-0.04494" />
+            <tca model="poly3" focal="18" br="0.0000246" vr="1.0008065" bb="0.00025" vb="0.9998" />
+            <tca model="poly3" focal="24" br="0.00004" vr="1.00056" bb="0.00024" vb="0.9999" />
+            <tca model="poly3" focal="35" br="0.00001" vr="1.000127" bb="0.000022" vb="1.0001" />
+            <tca model="poly3" focal="42.5" br="0.000084" vr="1.0000218" bb="-0.0000375" vb="1.0000794" />
+            <tca model="poly3" focal="55" br="0.0000165" vr="0.99999" bb="-0.0000538" vb="1.0000742" />
+        </calibration>
+    </lens>
+
+    <lens>
+        <maker>Pentax</maker>
+        <model>SMC PENTAX DA 18-135mm F/3.5-5.6 ED AL [IF] DC WR</model>
+        <mount>Pentax K</mount>
+        <cropfactor>1.5</cropfactor>
+        <calibration>
+            <distortion model="poly3"  focal="18" k1="-0.02615" />
+            <distortion model="poly3"  focal="24" k1="-0.00343" />
+            <distortion model="ptlens" focal="36" a="0.01095" b="-0.01774" c="0.01645" />
+            <distortion model="poly3"  focal="53" k1="0.00971" />
+            <distortion model="ptlens" focal="68" a="-0.00032" b="0.00979" c="-0.00265" />
+            <distortion model="poly3"  focal="100" k1="0.00771" />
+            <distortion model="poly3"  focal="135" k1="0.00701" />
+            <tca model="poly3" focal="18" br="0.0001" vr="1.00017" bb="0.00005" vb="1.00048" />
+            <tca model="poly3" focal="24" br="0.000" vr="1.00013" bb="0.0001" vb="1.000223" />
+            <tca model="poly3" focal="36" br="-0.000019" vr="1.00003" bb="-0.00005" vb="1.00023" />
+            <tca model="poly3" focal="53" br="0.0000" vr="0.9999" bb="-0.00005" vb="1.0001" />
+            <tca model="poly3" focal="68" br="0.000" vr="0.9998" bb="-0.00005" vb="1.0000" />
+            <tca model="poly3" focal="100" br="-0.00015" vr="0.99955" bb="-0.00005" vb="0.99996" />
+            <tca model="poly3" focal="135" br="-0.0004" vr="0.9994" bb="-0.00007" vb="0.99991" />
+            <vignetting model="pa" focal="18" aperture="11" distance="1000" k1="-0.0932" k2="0.02721" k3="-0.0432" />
+            <vignetting model="pa" focal="24" aperture="11" distance="1000" k1="-0.12861" k2="0.09689" k3="-0.05551" />
+            <vignetting model="pa" focal="36" aperture="11" distance="1000" k1="-0.14874" k2="0.19321" k3="-0.12757" />
+            <vignetting model="pa" focal="53" aperture="11" distance="1000" k1="-0.05186" k2="-0.06742" k3="0.05663" />
+            <vignetting model="pa" focal="68" aperture="11" distance="1000" k1="-0.11324" k2="0.21297" k3="-0.19382" />
+            <vignetting model="pa" focal="100" aperture="11" distance="1000" k1="-0.10339" k2="0.24899" k3="-0.28571" />
+            <vignetting model="pa" focal="135" aperture="11" distance="1000" k1="-0.16882" k2="0.35516" k3="-0.28791" />
+        </calibration>
+    </lens>
+
 </lensdatabase>
Index: db/slr-panasonic.xml
===================================================================
--- db/slr-panasonic.xml	(.../tags/0.2.5/data)	(Revision 157)
+++ db/slr-panasonic.xml	(.../trunk/data)	(Revision 157)
@@ -2,13 +2,6 @@
 
     <camera>
         <maker>Panasonic</maker>
-        <model>DMC-G1</model>
-        <mount>4/3 System</mount>
-        <cropfactor>2.0</cropfactor>
-    </camera>
-
-    <camera>
-        <maker>Panasonic</maker>
         <model>DMC-L1</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
@@ -16,7 +9,7 @@
 
     <camera>
         <maker>Panasonic</maker>
-        <model>DMC-GF1</model>
+        <model>DMC-L10</model>
         <mount>4/3 System</mount>
         <cropfactor>2.0</cropfactor>
     </camera>