File lens_database_update.diff of Package lensfun
Index: db/slr-canon.xml
===================================================================
--- db/slr-canon.xml (.../tags/0.2.5/data) (Revision 137)
+++ db/slr-canon.xml (.../trunk/data) (Revision 137)
@@ -340,6 +340,14 @@
<cropfactor>1.6</cropfactor>
</camera>
+ <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>
+
<lens>
<maker>Canon</maker>
<model>Canon EF-S 10-22mm f/3.5-4.5 USM</model>
@@ -790,6 +798,20 @@
<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 IS USM</model>
<mount>Canon EF</mount>
<cropfactor>1.6</cropfactor>
@@ -1066,6 +1088,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 +1130,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/compact-panasonic.xml
===================================================================
--- db/compact-panasonic.xml (.../tags/0.2.5/data) (Revision 137)
+++ db/compact-panasonic.xml (.../trunk/data) (Revision 137)
@@ -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 137)
+++ db/slr-olympus.xml (.../trunk/data) (Revision 137)
@@ -7,6 +7,12 @@
</mount>
<mount>
+ <name>Micro 4/3 System</name>
+ <compat>M42</compat>
+ <compat>Generic</compat>
+ </mount>
+
+ <mount>
<name>olympusE10</name>
<compat>Generic</compat>
</mount>
@@ -100,6 +106,30 @@
</camera>
<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-PL1</model>
+ <mount>Micro 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>
@@ -233,6 +263,27 @@
<lens>
<maker>Olympus</maker>
+ <model>Olympus M.Zuiko Digital ED 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>Standard</model>
<mount>olympusE10</mount>
<cropfactor>3.933</cropfactor>
@@ -315,4 +366,15 @@
</calibration>
</lens>
+ <lens>
+ <maker>Olympus</maker>
+ <model>Olympus M.Zuiko Digital 17mm F2.8 Pancake</model>
+ <mount>Micro 4/3 System</mount>
+ <cropfactor>2.0</cropfactor>
+ <calibration>
+ <distortion model="poly3" focal="17" k1="-0.110" />
+ <tca model="poly3" focal="17" br="-0.0002" vr="1.00045" bb="0.0003" vb="1.0002" />
+ </calibration>
+ </lens>
+
</lensdatabase>
Index: db/slr-nikon.xml
===================================================================
--- db/slr-nikon.xml (.../tags/0.2.5/data) (Revision 137)
+++ db/slr-nikon.xml (.../trunk/data) (Revision 137)
@@ -165,6 +165,24 @@
<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 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 D5000</model>
<model lang="en">D5000</model>
<mount>Nikon F AF</mount>
@@ -976,4 +994,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>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>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 137)
+++ db/compact-canon.xml (.../trunk/data) (Revision 137)
@@ -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>
@@ -130,6 +135,11 @@
<compat>Generic</compat>
</mount>
+ <mount>
+ <name>canonA650IS</name>
+ <compat>Generic</compat>
+ </mount>
+
<camera>
<maker>Canon</maker>
<model>Canon PowerShot Pro1</model>
@@ -188,6 +198,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>
@@ -720,6 +738,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>
@@ -1159,4 +1185,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 137)
+++ db/slr-tokina.xml (.../trunk/data) (Revision 137)
@@ -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>
@@ -56,7 +56,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.5</cropfactor>
<calibration>
<distortion model="ptlens" focal="17" a="0" b="-0.012125" c="0" />
@@ -67,7 +67,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 137)
+++ db/slr-sony.xml (.../trunk/data) (Revision 137)
@@ -73,6 +73,15 @@
<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>
@@ -115,4 +124,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/compact-olympus.xml
===================================================================
--- db/compact-olympus.xml (.../tags/0.2.5/data) (Revision 137)
+++ db/compact-olympus.xml (.../trunk/data) (Revision 137)
@@ -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-panasonic.xml
===================================================================
--- db/slr-panasonic.xml (.../tags/0.2.5/data) (Revision 137)
+++ db/slr-panasonic.xml (.../trunk/data) (Revision 137)
@@ -2,23 +2,107 @@
<camera>
<maker>Panasonic</maker>
- <model>DMC-G1</model>
+ <model>DMC-L1</model>
<mount>4/3 System</mount>
<cropfactor>2.0</cropfactor>
</camera>
<camera>
<maker>Panasonic</maker>
- <model>DMC-L1</model>
+ <model>DMC-L10</model>
<mount>4/3 System</mount>
<cropfactor>2.0</cropfactor>
</camera>
<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-G2</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>
+
+ <camera>
+ <maker>Panasonic</maker>
+ <model>DMC-G2</model>
<mount>4/3 System</mount>
<cropfactor>2.0</cropfactor>
</camera>
+ <lens>
+ <maker>Panasonic</maker>
+ <model>LUMIX G 20/F1.7</model>
+ <mount>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>4/3 System</mount>
+ <cropfactor>2</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>4/3 System</mount>
+ <cropfactor>2</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>
