In slr-samyang.xml it did catch an actual issue :)
DTD enforces a specific order to be used,
so that is the reason why the diff is so big.
---
data/db/6x6.xml | 3 +-
data/db/actioncams.xml | 9 +++--
data/db/compact-canon.xml | 3 +-
data/db/compact-casio.xml | 3 +-
data/db/compact-fujifilm.xml | 1 +
data/db/compact-kodak.xml | 3 +-
data/db/compact-konica-minolta.xml | 3 +-
data/db/compact-leica.xml | 3 +-
data/db/compact-nikon.xml | 3 +-
data/db/compact-olympus.xml | 3 +-
data/db/compact-panasonic.xml | 7 ++--
data/db/compact-pentax.xml | 3 +-
data/db/compact-ricoh.xml | 3 +-
data/db/compact-samsung.xml | 3 +-
data/db/compact-sigma.xml | 3 +-
data/db/compact-sony.xml | 7 ++--
data/db/contax.xml | 3 +-
data/db/generic.xml | 9 +++--
data/db/lensfun-database.dtd | 78 ++++++++++++++++++++++++++++++++++++++
data/db/mil-canon.xml | 3 +-
data/db/mil-fujifilm.xml | 3 +-
data/db/mil-nikon.xml | 3 +-
data/db/mil-olympus.xml | 15 ++++----
data/db/mil-panasonic.xml | 19 +++++-----
data/db/mil-pentax.xml | 7 ++--
data/db/mil-samsung.xml | 5 ++-
data/db/mil-samyang.xml | 7 ++--
data/db/mil-sigma.xml | 3 +-
data/db/mil-sony.xml | 7 ++--
data/db/mil-tamron.xml | 3 +-
data/db/mil-zeiss.xml | 3 +-
data/db/misc.xml | 3 +-
data/db/rf-leica.xml | 3 +-
data/db/slr-canon.xml | 9 +++--
data/db/slr-hasselblad.xml | 3 +-
data/db/slr-konica-minolta.xml | 5 ++-
data/db/slr-leica.xml | 3 +-
data/db/slr-nikon.xml | 7 ++--
data/db/slr-olympus.xml | 15 ++++----
data/db/slr-panasonic.xml | 3 +-
data/db/slr-pentax.xml | 21 +++++-----
data/db/slr-ricoh.xml | 3 +-
data/db/slr-samsung.xml | 3 +-
data/db/slr-samyang.xml | 9 +++--
data/db/slr-schneider.xml | 3 +-
data/db/slr-sigma.xml | 29 +++++++-------
data/db/slr-soligor.xml | 3 +-
data/db/slr-sony.xml | 5 ++-
data/db/slr-tamron.xml | 5 ++-
data/db/slr-tokina.xml | 7 ++--
data/db/slr-ussr.xml | 11 +++---
data/db/slr-vivitar.xml | 3 +-
data/db/slr-zeiss.xml | 3 +-
53 files changed, 257 insertions(+), 127 deletions(-)
create mode 100644 data/db/lensfun-database.dtd
diff --git a/data/db/6x6.xml b/data/db/6x6.xml
index 35ced86..580c139 100644
--- a/data/db/6x6.xml
+++ b/data/db/6x6.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -99,4 +100,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/actioncams.xml b/data/db/actioncams.xml
index 0a7fd7a..0e842b7 100644
--- a/data/db/actioncams.xml
+++ b/data/db/actioncams.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -53,8 +54,8 @@
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
<mount>dijPhantomVisionFC200</mount>
- <cropfactor>6</cropfactor>
<type>equisolid</type>
+ <cropfactor>6</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
<distortion model="ptlens" focal="5" a="0.02707" b="-0.10021"
c="-0.09787"/>
@@ -68,8 +69,8 @@
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
<mount>goProHero4</mount>
- <cropfactor>7.66</cropfactor>
<type>equisolid</type>
+ <cropfactor>7.66</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
<distortion model="ptlens" focal="3" a="0.03183" b="-0.11592"
c="0"/>
@@ -79,12 +80,12 @@
<lens>
<maker>AEE</maker>
<model>AEE SD19 & compatibles</model>
- <mount>aeeDV</mount>
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
+ <mount>aeeDV</mount>
+ <type>equisolid</type>
<!-- The crop factor is only estimated from the 1/2.5" specs. -->
<cropfactor>6</cropfactor>
- <type>equisolid</type>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
<!-- Measured with 360° panorama -->
diff --git a/data/db/compact-canon.xml b/data/db/compact-canon.xml
index bb15a15..1f12159 100644
--- a/data/db/compact-canon.xml
+++ b/data/db/compact-canon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -2393,4 +2394,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-casio.xml b/data/db/compact-casio.xml
index 8574175..b65bdd8 100644
--- a/data/db/compact-casio.xml
+++ b/data/db/compact-casio.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -194,4 +195,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-fujifilm.xml b/data/db/compact-fujifilm.xml
index 501b639..bb4b76e 100644
--- a/data/db/compact-fujifilm.xml
+++ b/data/db/compact-fujifilm.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
diff --git a/data/db/compact-kodak.xml b/data/db/compact-kodak.xml
index fb1df50..54e2598 100644
--- a/data/db/compact-kodak.xml
+++ b/data/db/compact-kodak.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -45,4 +46,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-konica-minolta.xml
b/data/db/compact-konica-minolta.xml
index a9c0a53..55bf4fc 100644
--- a/data/db/compact-konica-minolta.xml
+++ b/data/db/compact-konica-minolta.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -336,4 +337,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-leica.xml b/data/db/compact-leica.xml
index 8d899df..269b747 100644
--- a/data/db/compact-leica.xml
+++ b/data/db/compact-leica.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -60,4 +61,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-nikon.xml b/data/db/compact-nikon.xml
index 9412820..5f6742e 100644
--- a/data/db/compact-nikon.xml
+++ b/data/db/compact-nikon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -675,4 +676,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-olympus.xml b/data/db/compact-olympus.xml
index bf47c8c..b775ad9 100644
--- a/data/db/compact-olympus.xml
+++ b/data/db/compact-olympus.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -674,4 +675,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-panasonic.xml b/data/db/compact-panasonic.xml
index 8c49214..362bb64 100644
--- a/data/db/compact-panasonic.xml
+++ b/data/db/compact-panasonic.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -300,9 +301,9 @@
<model>DMC-LX5 & compatibles (Standard)</model>
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
+ <mount>panasonicLX5</mount>
<focal min="5.1" max="19.2"/>
<aperture min="2" max="8"/>
- <mount>panasonicLX5</mount>
<cropfactor>4.71</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -690,8 +691,8 @@
<model>FZ150 & compatibles</model>
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
- <focal min="4.5" max="54.7"/>
<mount>panasonicFZ150</mount>
+ <focal min="4.5" max="54.7"/>
<cropfactor>5.56</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -759,4 +760,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-pentax.xml b/data/db/compact-pentax.xml
index 2934c0c..a322605 100644
--- a/data/db/compact-pentax.xml
+++ b/data/db/compact-pentax.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -167,4 +168,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-ricoh.xml b/data/db/compact-ricoh.xml
index b5e13f9..836f194 100644
--- a/data/db/compact-ricoh.xml
+++ b/data/db/compact-ricoh.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -122,4 +123,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-samsung.xml b/data/db/compact-samsung.xml
index a27362e..81b6652 100644
--- a/data/db/compact-samsung.xml
+++ b/data/db/compact-samsung.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -101,4 +102,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-sigma.xml b/data/db/compact-sigma.xml
index 42f2b6f..d778d89 100644
--- a/data/db/compact-sigma.xml
+++ b/data/db/compact-sigma.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -85,4 +86,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/compact-sony.xml b/data/db/compact-sony.xml
index 04584a5..2cbef05 100644
--- a/data/db/compact-sony.xml
+++ b/data/db/compact-sony.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -777,8 +778,8 @@
<model>DSC-RX100 & compatibles (Standard)</model>
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
- <focal min="10.4" max="37.1"/>
<mount>sonyRX100</mount>
+ <focal min="10.4" max="37.1"/>
<cropfactor>2.73</cropfactor>
<aspect-ratio>3:2</aspect-ratio>
<calibration>
@@ -1038,8 +1039,8 @@
<model>DSC-HX300 & compatibles (Standard)</model>
<model lang="en">fixed lens</model>
<model lang="de">festes Objektiv</model>
- <focal min="4.3" max="215"/>
<mount>sonyHX300</mount>
+ <focal min="4.3" max="215"/>
<cropfactor>5.58</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -1091,4 +1092,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/contax.xml b/data/db/contax.xml
index 67cc18c..223d161 100644
--- a/data/db/contax.xml
+++ b/data/db/contax.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -55,4 +56,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/generic.xml b/data/db/generic.xml
index 010c542..13f3e1f 100644
--- a/data/db/generic.xml
+++ b/data/db/generic.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<!--
The meaning of this file is to provide some generic lenses that can be used
to correct or simulate geometric distortions for specific types of lenses.
@@ -120,8 +121,8 @@
<model>Rectilinear 10-1000mm f/1.0</model>
<model lang="de">Rektilinear 10-1000mm f/1.0</model>
<mount>Generic</mount>
- <cropfactor>1</cropfactor>
<type>rectilinear</type>
+ <cropfactor>1</cropfactor>
</lens>
<lens>
@@ -130,8 +131,8 @@
<model>Fisheye 8-20mm f/1.0</model>
<model lang="de">Fischauge 8-20mm f/1.0</model>
<mount>Generic</mount>
- <cropfactor>1</cropfactor>
<type>fisheye</type>
+ <cropfactor>1</cropfactor>
</lens>
<lens>
@@ -140,8 +141,8 @@
<model>Panoramic 10-100mm f/1.0</model>
<model lang="de">Panoramaobjektiv 10-100mm f/1.0</model>
<mount>Generic</mount>
- <cropfactor>1</cropfactor>
<type>panoramic</type>
+ <cropfactor>1</cropfactor>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/lensfun-database.dtd b/data/db/lensfun-database.dtd
new file mode 100644
index 0000000..71d46e1
--- /dev/null
+++ b/data/db/lensfun-database.dtd
@@ -0,0 +1,78 @@
+<!ELEMENT lensdatabase (mount*, camera*, lens*) >
+<!ATTLIST lensdatabase version NMTOKEN #REQUIRED >
+
+<!ELEMENT mount (#PCDATA | name | compat)* >
+
+<!ELEMENT name (#PCDATA) >
+<!ATTLIST name lang CDATA #IMPLIED >
+
+<!ELEMENT compat (#PCDATA) >
+
+<!ELEMENT camera (maker+, model+, variant?, mount, cropfactor, aspect-ratio?) >
+
+<!ELEMENT maker (#PCDATA) >
+<!ATTLIST maker lang CDATA #IMPLIED >
+
+<!ELEMENT model (#PCDATA) >
+<!ATTLIST model lang CDATA #IMPLIED >
+
+<!ELEMENT variant (#PCDATA) >
+
+<!ELEMENT cropfactor (#PCDATA) >
+
+<!ELEMENT aspect-ratio (#PCDATA) >
+
+<!ELEMENT lens (maker+, model+, mount+, focal?, aperture?, type?, cropfactor,
aspect-ratio?, calibration?) >
+
+<!ELEMENT focal EMPTY >
+<!ATTLIST focal min NMTOKEN #IMPLIED >
+<!ATTLIST focal max NMTOKEN #IMPLIED >
+<!-- or -->
+<!ATTLIST focal value NMTOKEN #IMPLIED >
+
+<!ELEMENT aperture EMPTY >
+<!ATTLIST aperture min NMTOKEN #IMPLIED >
+<!ATTLIST aperture max NMTOKEN #IMPLIED >
+<!-- or -->
+<!ATTLIST aperture value NMTOKEN #IMPLIED >
+
+<!ELEMENT type (#PCDATA) >
+
+<!ELEMENT calibration (distortion*, tca*, vignetting*)+ >
+
+<!ELEMENT distortion EMPTY >
+<!ATTLIST distortion model (poly3 | poly5 | ptlens) #REQUIRED >
+<!ATTLIST distortion focal NMTOKEN #REQUIRED >
+<!ATTLIST distortion real-focal NMTOKEN #IMPLIED >
+<!-- when model = poly3 | poly5 -->
+<!ATTLIST distortion k1 NMTOKEN #IMPLIED >
+<!-- when model = poly5 -->
+<!ATTLIST distortion k2 NMTOKEN #IMPLIED >
+<!-- else, when model = ptlens -->
+<!ATTLIST distortion a NMTOKEN #IMPLIED >
+<!ATTLIST distortion b NMTOKEN #IMPLIED >
+<!ATTLIST distortion c NMTOKEN #IMPLIED >
+
+<!ELEMENT tca EMPTY >
+<!ATTLIST tca model (linear | poly3) #REQUIRED >
+<!ATTLIST tca focal NMTOKEN #REQUIRED >
+<!-- when model = linear -->
+<!ATTLIST tca kr NMTOKEN #IMPLIED >
+<!ATTLIST tca kb NMTOKEN #IMPLIED >
+<!-- else, when model = poly3 -->
+<!ATTLIST tca vr NMTOKEN #IMPLIED >
+<!ATTLIST tca vb NMTOKEN #IMPLIED >
+<!ATTLIST tca cr NMTOKEN #IMPLIED >
+<!ATTLIST tca cb NMTOKEN #IMPLIED >
+<!ATTLIST tca br NMTOKEN #IMPLIED >
+<!ATTLIST tca bb NMTOKEN #IMPLIED >
+
+<!ELEMENT vignetting EMPTY >
+<!ATTLIST vignetting model (pa) #REQUIRED >
+<!ATTLIST vignetting focal NMTOKEN #REQUIRED >
+<!ATTLIST vignetting aperture NMTOKEN #REQUIRED >
+<!ATTLIST vignetting distance NMTOKEN #REQUIRED >
+<!-- when model = pa -->
+<!ATTLIST vignetting k1 NMTOKEN #REQUIRED >
+<!ATTLIST vignetting k2 NMTOKEN #REQUIRED >
+<!ATTLIST vignetting k3 NMTOKEN #REQUIRED >
diff --git a/data/db/mil-canon.xml b/data/db/mil-canon.xml
index 716d38a..10c2f16 100644
--- a/data/db/mil-canon.xml
+++ b/data/db/mil-canon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -212,4 +213,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-fujifilm.xml b/data/db/mil-fujifilm.xml
index 42c95bf..0b02ed1 100644
--- a/data/db/mil-fujifilm.xml
+++ b/data/db/mil-fujifilm.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -526,4 +527,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-nikon.xml b/data/db/mil-nikon.xml
index d63cda3..8a6732d 100644
--- a/data/db/mil-nikon.xml
+++ b/data/db/mil-nikon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -201,4 +202,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-olympus.xml b/data/db/mil-olympus.xml
index 2866d3f..e5503a0 100644
--- a/data/db/mil-olympus.xml
+++ b/data/db/mil-olympus.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -148,9 +149,9 @@
<maker>Olympus</maker>
<model>Olympus M.Zuiko Digital ED 12mm f/2.0</model>
<mount>Micro 4/3 System</mount>
+ <focal value="12"/>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
- <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"/>
@@ -348,9 +349,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus M.Zuiko Digital ED 14-150mm f/4.0-5.6</model>
+ <mount>Micro 4/3 System</mount>
<focal min="14" max="150"/>
<aperture min="4" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -512,9 +513,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus M.Zuiko Digital 45mm f/1.8</model>
+ <mount>Micro 4/3 System</mount>
<focal value="45"/>
<aperture min="1.8" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -717,8 +718,8 @@
<maker>Olympus</maker>
<model>Olympus M.Zuiko Digital 25mm f/1.8</model>
<mount>Micro 4/3 System</mount>
- <aspect-ratio>4:3</aspect-ratio>
<cropfactor>2</cropfactor>
+ <aspect-ratio>4:3</aspect-ratio>
<calibration>
<!-- Taken with E-M10 -->
<distortion model="ptlens" focal="25" a="0.00454" b="-0.0141"
c="0.00283"/>
@@ -905,9 +906,9 @@
<maker>Olympus</maker>
<model>Olympus 9mm Body Cap Lens Fisheye</model>
<mount>Micro 4/3 System</mount>
+ <type>stereographic</type>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
- <type>stereographic</type>
<calibration>
<!-- Taken with Olympus E-M10 -->
<distortion model="poly3" focal="9" k1="-0.03111"/>
@@ -918,9 +919,9 @@
<maker>Olympus</maker>
<model>Olympus M.Zuiko Digital ED 8mm f/1.8 Fisheye Pro</model>
<mount>Micro 4/3 System</mount>
+ <type>equisolid</type>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
- <type>equisolid</type>
<calibration>
<!-- Taken with Olympus E-M5 II -->
<distortion model="poly3" focal="8" k1="-0.00531"/>
@@ -928,4 +929,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-panasonic.xml b/data/db/mil-panasonic.xml
index 038c683..80d5228 100644
--- a/data/db/mil-panasonic.xml
+++ b/data/db/mil-panasonic.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -143,9 +144,9 @@
<lens>
<maker>Panasonic</maker>
<model>Lumix G 14mm f/2.5 Asph.</model>
+ <mount>Micro 4/3 System</mount>
<focal value="14"/>
<aperture min="2.5" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -177,9 +178,9 @@
<lens>
<maker>Panasonic</maker>
<model>Lumix G 14mm f/2.5 Asph. + GWC1 0.79x</model>
+ <mount>Micro 4/3 System</mount>
<focal value="14"/>
<aperture min="2.5" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -211,9 +212,9 @@
<lens>
<maker>Panasonic</maker>
<model>Lumix G 20mm f/1.7 Asph.</model>
+ <mount>Micro 4/3 System</mount>
<focal value="20"/>
<aperture min="1.7" max="16"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -246,9 +247,9 @@
<maker>Panasonic</maker>
<model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS</model>
<model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6</model>
+ <mount>Micro 4/3 System</mount>
<focal min="14" max="42"/>
<aperture min="3.5" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -369,9 +370,9 @@
<maker>Panasonic</maker>
<model>Lumix G Vario 14-42mm f/3.5-5.6 II Asph. Mega OIS</model>
<model lang="en">Lumix G Vario 14-42mm f/3.5-5.6 II</model>
+ <mount>Micro 4/3 System</mount>
<focal min="14" max="42"/>
<aperture min="3.5" max="5.6"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -447,9 +448,9 @@
<maker>Panasonic</maker>
<model>Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS + GWC1
0.79x</model>
<model lang="en">Lumix G X Vario PZ 14-42mm f/3.5-5.6 + GWC1
0.79×</model>
+ <mount>Micro 4/3 System</mount>
<focal min="14" max="42"/>
<aperture min="3.5" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -706,9 +707,9 @@
<maker>Panasonic</maker>
<model>Lumix G Vario HD 14-140mm f/4.0-5.8 Asph. Mega OIS</model>
<model lang="en">Lumix G Vario HD 14-140mm f/4.0-5.8</model>
+ <mount>Micro 4/3 System</mount>
<focal min="14" max="140"/>
<aperture min="4" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -951,9 +952,9 @@
<maker>Panasonic</maker>
<model>Lumix G Vario 100-300mm f/4.0-5.6 Mega OIS</model>
<model lang="en">Lumix G Vario 100-300mm f/4.0-5.6</model>
+ <mount>Micro 4/3 System</mount>
<focal min="100" max="300"/>
<aperture min="4" max="22"/>
- <mount>Micro 4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -1371,4 +1372,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-pentax.xml b/data/db/mil-pentax.xml
index e9307af..0429e7a 100644
--- a/data/db/mil-pentax.xml
+++ b/data/db/mil-pentax.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -30,13 +31,13 @@
<maker>Pentax</maker>
<model>01 Standard Prime 8.5mm f/1.9 AL [IF]</model>
<mount>Pentax Q</mount>
- <cropfactor>5.53</cropfactor>
- <aspect-ratio>4:3</aspect-ratio>
<focal value="8.5"/>
<aperture min="1.9" max="8"/>
+ <cropfactor>5.53</cropfactor>
+ <aspect-ratio>4:3</aspect-ratio>
<calibration>
<distortion model="poly3" focal="8.5" k1="-0.01529"/>
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-samsung.xml b/data/db/mil-samsung.xml
index f3b05d7..7a9fa41 100644
--- a/data/db/mil-samsung.xml
+++ b/data/db/mil-samsung.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -251,8 +252,8 @@
<model>Samsung NX 10mm f/3.5 Fisheye</model>
<model lang="de">Samsung NX 10mm f/3.5 Fischauge</model>
<mount>Samsung NX</mount>
- <cropfactor>1.531</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.531</cropfactor>
<calibration>
<!-- Taken with Samsung NX30 -->
<distortion model="ptlens" focal="10" a="-0.0459" b="0.13431"
c="-0.10789"/>
@@ -260,4 +261,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-samyang.xml b/data/db/mil-samyang.xml
index 91584da..5771638 100644
--- a/data/db/mil-samyang.xml
+++ b/data/db/mil-samyang.xml
@@ -1,12 +1,13 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
<maker>Samyang</maker>
<model>Samyang 7.5mm f/3.5 UMC Fish-eye MFT</model>
<model lang="de">Samyang 7.5mm f/3.5 UMC Fischauge MFT</model>
+ <mount>Micro 4/3 System</mount>
<focal value="7.5"/>
<aperture min="3.5" max="22"/>
- <mount>Micro 4/3 System</mount>
<type>fisheye</type>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
@@ -43,8 +44,8 @@
<mount>Sony E</mount>
<mount>Fujifilm X</mount>
<mount>Samsung NX</mount>
- <cropfactor>1.534</cropfactor>
<type>stereographic</type>
+ <cropfactor>1.534</cropfactor>
<calibration>
<!-- Taken with Sony NEX-7 -->
<!-- Measured with a 360° panorama -->
@@ -93,4 +94,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-sigma.xml b/data/db/mil-sigma.xml
index e7d7cc3..5926059 100644
--- a/data/db/mil-sigma.xml
+++ b/data/db/mil-sigma.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -106,4 +107,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-sony.xml b/data/db/mil-sony.xml
index b83b483..0c1a9fa 100644
--- a/data/db/mil-sony.xml
+++ b/data/db/mil-sony.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -414,8 +415,8 @@
<model>VCL-ECF1 fisheye converter</model>
<model lang="de">VCL-ECF1 Fischauge-Vorsatz</model>
<mount>Sony E</mount>
- <cropfactor>1.534</cropfactor>
<type>fisheye</type>
+ <cropfactor>1.534</cropfactor>
<calibration>
<!-- Taken with Sony NEX-7 -->
<!-- Measured with 360° panorama -->
@@ -761,8 +762,8 @@
<lens>
<maker>Sony</maker>
<model>FE 28-70mm f/3.5-5.6 OSS</model>
- <aperture min="3.5" max="5.6"/>
<mount>Sony E</mount>
+ <aperture min="3.5" max="5.6"/>
<cropfactor>1</cropfactor>
<calibration>
<!-- Taken with Sony A7 -->
@@ -902,4 +903,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-tamron.xml b/data/db/mil-tamron.xml
index 2d78ef4..5cb9c04 100644
--- a/data/db/mil-tamron.xml
+++ b/data/db/mil-tamron.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -23,4 +24,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/mil-zeiss.xml b/data/db/mil-zeiss.xml
index 8757a49..f3b5e41 100644
--- a/data/db/mil-zeiss.xml
+++ b/data/db/mil-zeiss.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -69,4 +70,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/misc.xml b/data/db/misc.xml
index bb51bb8..564479e 100644
--- a/data/db/misc.xml
+++ b/data/db/misc.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -123,8 +124,8 @@
<mount>Nikon F</mount>
<mount>Canon EF</mount>
<mount>Pentax K</mount>
- <cropfactor>1.529</cropfactor>
<type>fisheye</type>
+ <cropfactor>1.529</cropfactor>
<calibration>
<!-- Taken with Fujifilm X-E2 -->
<distortion model="poly3" focal="16" k1="-0.00676"/>
diff --git a/data/db/rf-leica.xml b/data/db/rf-leica.xml
index 4de71a3..31d0c67 100644
--- a/data/db/rf-leica.xml
+++ b/data/db/rf-leica.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<!--
I have created this file to have a place where I can drop all information
that I can find about Leica rangefinder cameras and lenses. It's far from
@@ -138,4 +139,4 @@
<cropfactor>1</cropfactor>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-canon.xml b/data/db/slr-canon.xml
index ea9e64f..c0df392 100644
--- a/data/db/slr-canon.xml
+++ b/data/db/slr-canon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -677,8 +678,8 @@
<model>Canon EF 15mm f/2.8 Fisheye</model>
<model lang="de">Canon EF 15mm f/2.8 Fischauge</model>
<mount>Canon EF</mount>
- <cropfactor>1</cropfactor>
<type>fisheye</type>
+ <cropfactor>1</cropfactor>
</lens>
<lens>
@@ -2469,9 +2470,9 @@
<lens>
<maker>Canon</maker>
<model>Canon FDn 50mm 1:1.4</model>
+ <mount>Canon FD</mount>
<focal value="50"/>
<aperture min="1.4" max="22"/>
- <mount>Canon FD</mount>
<cropfactor>2</cropfactor>
<calibration>
<distortion model="ptlens" focal="50" a="-0.000919817"
b="0.00112022" c="-0.00289404"/>
@@ -2669,9 +2670,9 @@
<lens>
<maker>Canon</maker>
<model>Canon FDn 100mm 1:2.8</model>
+ <mount>Canon FD</mount>
<focal value="100"/>
<aperture min="2.8" max="32"/>
- <mount>Canon FD</mount>
<cropfactor>2</cropfactor>
<calibration>
<distortion model="ptlens" focal="100" a="-0.000626176"
b="0.00321735" c="-0.0016503"/>
@@ -4398,8 +4399,8 @@
<model>Canon EF 8-15mm f/4L Fisheye USM</model>
<model lang="de">Canon EF 8-15mm f/4L Fischauge USM</model>
<mount>Canon EF</mount>
- <cropfactor>1</cropfactor>
<type>equisolid</type>
+ <cropfactor>1</cropfactor>
<calibration>
<!-- Taken with Canon 5D Mark III -->
<!-- Measured with three overlapping images -->
diff --git a/data/db/slr-hasselblad.xml b/data/db/slr-hasselblad.xml
index ebc5e84..c174603 100644
--- a/data/db/slr-hasselblad.xml
+++ b/data/db/slr-hasselblad.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -24,4 +25,4 @@
<cropfactor>0.72</cropfactor>
</camera>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-konica-minolta.xml b/data/db/slr-konica-minolta.xml
index a4d85ad..8a49fdf 100644
--- a/data/db/slr-konica-minolta.xml
+++ b/data/db/slr-konica-minolta.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -122,9 +123,9 @@
<lens>
<maker>Minolta</maker>
<model>Minolta MC Rokkor-PG 50mm 1:1.4</model>
+ <mount>Minolta MC</mount>
<focal value="50"/>
<aperture min="1.4" max="16"/>
- <mount>Minolta MC</mount>
<cropfactor>2</cropfactor>
<calibration>
<distortion model="ptlens" focal="50" a="-0.000767655"
b="-0.000599186" c="-0.00129564"/>
@@ -257,4 +258,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-leica.xml b/data/db/slr-leica.xml
index bcf77a2..365d136 100644
--- a/data/db/slr-leica.xml
+++ b/data/db/slr-leica.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -41,4 +42,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-nikon.xml b/data/db/slr-nikon.xml
index 2c01030..dc6bec9 100644
--- a/data/db/slr-nikon.xml
+++ b/data/db/slr-nikon.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -795,9 +796,9 @@
<maker>Nikon</maker>
<model>Nikon AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED</model>
<model lang="en">Nikkor AF-S 18-70mm f/3.5-4.5G DX IF-ED</model>
+ <mount>Nikon F AF</mount>
<focal min="18" max="70"/>
<aperture min="3.5" max="29"/>
- <mount>Nikon F AF</mount>
<!-- Average crop factor of Nikon APS-C cameras -->
<cropfactor>1.528</cropfactor>
<calibration>
@@ -2862,8 +2863,8 @@
<model>Nikon AI-S Fisheye-Nikkor 6mm f/2.8</model>
<model lang="en">Nikkor AI-S 6mm f/2.8 Fisheye</model>
<mount>Nikon F AI-S</mount>
- <cropfactor>1</cropfactor>
<type>fisheye</type>
+ <cropfactor>1</cropfactor>
<calibration>
<!-- Taken from
http://www.mir.com.my/rb/photography/companies/nikon/nikkoresources/fisheyes/6mm_FisheyeNikkor-Manual/8.jpg
@@ -2967,8 +2968,8 @@
<model>Nikon AF DX Fisheye-Nikkor 10.5mm f/2.8G ED</model>
<model lang="en">Nikkor AF 10.5mm f/2.8G DX ED Fisheye</model>
<mount>Nikon F AF</mount>
- <cropfactor>1.523</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.523</cropfactor>
<calibration>
<!-- Taken with Nikon D7000 -->
<!-- Taken with panorama -->
diff --git a/data/db/slr-olympus.xml b/data/db/slr-olympus.xml
index 76e6a0d..c258d5f 100644
--- a/data/db/slr-olympus.xml
+++ b/data/db/slr-olympus.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -172,9 +173,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital ED 9-18mm f/4.0-5.6</model>
+ <mount>4/3 System</mount>
<focal min="9" max="18"/>
<aperture min="4" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -292,9 +293,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital ED 14-42mm f/3.5-5.6</model>
+ <mount>4/3 System</mount>
<focal min="14" max="42"/>
<aperture min="3.5" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -450,9 +451,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital 25mm f/2.8</model>
+ <mount>4/3 System</mount>
<focal value="25"/>
<aperture min="2.8" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -484,9 +485,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital 35mm f/3.5 Macro</model>
+ <mount>4/3 System</mount>
<focal value="35"/>
<aperture min="3.5" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -533,9 +534,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital ED 40-150mm f/4.0-5.6</model>
+ <mount>4/3 System</mount>
<focal min="40" max="150"/>
<aperture min="4" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -803,9 +804,9 @@
<lens>
<maker>Olympus</maker>
<model>Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD</model>
+ <mount>4/3 System</mount>
<focal min="12" max="60"/>
<aperture min="2.8" max="4"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -825,4 +826,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-panasonic.xml b/data/db/slr-panasonic.xml
index ba30ddf..99aa1c9 100644
--- a/data/db/slr-panasonic.xml
+++ b/data/db/slr-panasonic.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -14,4 +15,4 @@
<cropfactor>2</cropfactor>
</camera>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-pentax.xml b/data/db/slr-pentax.xml
index 27593e2..029eb1a 100644
--- a/data/db/slr-pentax.xml
+++ b/data/db/slr-pentax.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -332,9 +333,9 @@
<!-- FixMe: According to
<http://en.wikipedia.org/wiki/Pentax_DA_18-55mm_lens>, Samsung
D-XENON 18-55mm 1:3.5-5.6 AL is an alias. -->
+ <mount>Pentax KAF2</mount>
<focal min="18" max="55"/>
<aperture min="3.5" max="40"/>
- <mount>Pentax KAF2</mount>
<!-- Average crop factor of Pentax APS-C cameras -->
<cropfactor>1.53</cropfactor>
<calibration>
@@ -966,13 +967,13 @@
<!-- Taken with Pentax K-30 -->
<distortion model="poly3" focal="50" k1="-0.00203"/>
<tca model="poly3" focal="50" br="-0.0000488" cr="0.0001144"
vr="1.0005239" bb="0.0001427" cb="-0.0002953" vb="0.9994200"/>
- <vignetting model="pa" focal="50" aperture="1.4" k1="-0.75531"
k2="0.64285" k3="-0.26061"/>
- <vignetting model="pa" focal="50" aperture="2" k1="-0.06676"
k2="-0.04799" k3="0.02031"/>
- <vignetting model="pa" focal="50" aperture="5.6" k1="-0.15783"
k2="0.15089" k3="-0.01524"/>
- <vignetting model="pa" focal="50" aperture="8" k1="-0.1018"
k2="-0.00066" k3="0.06612"/>
- <vignetting model="pa" focal="50" aperture="11" k1="-0.00027"
k2="-0.25301" k3="0.20985"/>
- <vignetting model="pa" focal="50" aperture="16" k1="-0.13985"
k2="0.13367" k3="-0.03586"/>
- <vignetting model="pa" focal="50" aperture="22" k1="-0.05391"
k2="-0.06313" k3="0.11027"/>
+ <vignetting model="pa" focal="50" aperture="1.4" distance="1000"
k1="-0.75531" k2="0.64285" k3="-0.26061"/>
+ <vignetting model="pa" focal="50" aperture="2" distance="1000"
k1="-0.06676" k2="-0.04799" k3="0.02031"/>
+ <vignetting model="pa" focal="50" aperture="5.6" distance="1000"
k1="-0.15783" k2="0.15089" k3="-0.01524"/>
+ <vignetting model="pa" focal="50" aperture="8" distance="1000"
k1="-0.1018" k2="-0.00066" k3="0.06612"/>
+ <vignetting model="pa" focal="50" aperture="11" distance="1000"
k1="-0.00027" k2="-0.25301" k3="0.20985"/>
+ <vignetting model="pa" focal="50" aperture="16" distance="1000"
k1="-0.13985" k2="0.13367" k3="-0.03586"/>
+ <vignetting model="pa" focal="50" aperture="22" distance="1000"
k1="-0.05391" k2="-0.06313" k3="0.11027"/>
</calibration>
</lens>
@@ -1112,8 +1113,8 @@
<maker>Pentax</maker>
<model>smc Pentax-DA Fish-Eye 10-17mm f/3.5-4.5 ED IF</model>
<mount>Pentax KAF2</mount>
- <cropfactor>1.538</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.538</cropfactor>
<calibration>
<!-- Taken with Pentax K-7 -->
<distortion model="ptlens" focal="10" a="-0.03518" b="0.12586"
c="-0.09198"/>
@@ -1163,8 +1164,8 @@
<lens>
<maker>Pentax</maker>
<model>smc Pentax-A 28mm 1:2.8</model>
- <aperture min="2.8" max="22"/>
<mount>Pentax KA</mount>
+ <aperture min="2.8" max="22"/>
<cropfactor>1.538</cropfactor>
<calibration>
<!-- Taken with Pentax K20D -->
diff --git a/data/db/slr-ricoh.xml b/data/db/slr-ricoh.xml
index 29e8d86..a5039c8 100644
--- a/data/db/slr-ricoh.xml
+++ b/data/db/slr-ricoh.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -37,4 +38,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-samsung.xml b/data/db/slr-samsung.xml
index ccf2c0c..c0e8a7d 100644
--- a/data/db/slr-samsung.xml
+++ b/data/db/slr-samsung.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<camera>
@@ -27,4 +28,4 @@
<cropfactor>1.531</cropfactor>
</camera>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-samyang.xml b/data/db/slr-samyang.xml
index 15713b9..df65c4c 100644
--- a/data/db/slr-samyang.xml
+++ b/data/db/slr-samyang.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -13,8 +14,8 @@
<mount>4/3 System</mount>
<mount>Micro 4/3 System</mount>
<mount>Samsung NX</mount>
- <cropfactor>1.534</cropfactor>
<type>stereographic</type>
+ <cropfactor>1.534</cropfactor>
<calibration>
<!-- Taken with some APS-C Pentax probably. -->
<tca model="poly3" focal="8" br="-0.0007764" cr="0.0013798"
vr="1.0000228" bb="-0.0002711" cb="0.0008531" vb="0.9998496"/>
@@ -131,11 +132,11 @@
<mount>Nikon F AI</mount>
<mount>Canon EF</mount>
<mount>Sony E</mount>
- <cropfactor>1</cropfactor>
<type>stereographic</type>
+ <cropfactor>1</cropfactor>
<calibration>
<!-- Taken with D800 -->
- <distortion model="ptlens" focal="12" a="a=-0.000331804"
b="-0.00911417" c="-0.044237"/>
+ <distortion model="ptlens" focal="12" a="-0.000331804"
b="-0.00911417" c="-0.044237"/>
<vignetting model="pa" focal="12" aperture="2.8" distance="10"
k1="-0.90717" k2="0.58477" k3="-0.2198"/>
<vignetting model="pa" focal="12" aperture="2.8" distance="1000"
k1="-0.90717" k2="0.58477" k3="-0.2198"/>
<vignetting model="pa" focal="12" aperture="4" distance="10"
k1="-0.17101" k2="-0.54574" k3="0.3056"/>
@@ -158,4 +159,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-schneider.xml b/data/db/slr-schneider.xml
index d2ae91e..2b06d70 100644
--- a/data/db/slr-schneider.xml
+++ b/data/db/slr-schneider.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -56,4 +57,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-sigma.xml b/data/db/slr-sigma.xml
index 9dd6579..dca9f7e 100644
--- a/data/db/slr-sigma.xml
+++ b/data/db/slr-sigma.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -62,14 +63,14 @@
<!-- HSM is not available for Sony and Pentax, so don't display it for
avoiding confusion. -->
<model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
- <focal min="10" max="20"/>
- <aperture min="4" max="32"/>
<mount>Nikon F AF</mount>
<mount>Sigma SA</mount>
<mount>Canon EF</mount>
<mount>Pentax KAF2</mount>
<mount>Sony Alpha</mount>
<mount>4/3 System</mount>
+ <focal min="10" max="20"/>
+ <aperture min="4" max="32"/>
<!-- Average crop factor of non-Canon APS-C cameras -->
<cropfactor>1.53</cropfactor>
<calibration>
@@ -187,14 +188,14 @@
<!-- HSM is not available for Sony and Pentax, so don't display it for
avoiding confusion. -->
<model lang="en">Sigma 10-20mm f/4-5.6 EX DC</model>
- <focal min="10" max="20"/>
- <aperture min="4" max="32"/>
<mount>Nikon F AF</mount>
<mount>Sigma SA</mount>
<mount>Canon EF</mount>
<mount>Pentax KAF2</mount>
<mount>Sony Alpha</mount>
<mount>4/3 System</mount>
+ <focal min="10" max="20"/>
+ <aperture min="4" max="32"/>
<cropfactor>1.620</cropfactor>
<calibration>
<!-- Taken with Canon 60D -->
@@ -671,13 +672,13 @@
<lens>
<maker>Sigma</maker>
<model>Sigma 18-200mm f/3.5-6.3 DC</model>
- <focal min="18" max="200"/>
- <aperture min="3.5" max="40"/>
<mount>Sigma SA</mount>
<mount>Nikon F AF</mount>
<mount>Canon EF</mount>
<mount>Pentax KAF2</mount>
<mount>Sony Alpha</mount>
+ <focal min="18" max="200"/>
+ <aperture min="3.5" max="40"/>
<!-- Average crop factor of non-Canon APS-C cameras -->
<cropfactor>1.53</cropfactor>
<calibration>
@@ -872,12 +873,12 @@
<lens>
<maker>Sigma</maker>
<model>Sigma 24-60mm f/2.8 EX DG</model>
- <focal min="24" max="60"/>
- <aperture min="2.8" max="22"/>
<mount>Nikon F AF</mount>
<mount>Canon EF</mount>
<mount>Pentax KAF2</mount>
<mount>Sony Alpha</mount>
+ <focal min="24" max="60"/>
+ <aperture min="2.8" max="22"/>
<!-- Average crop factor of non-Canon APS-C cameras -->
<cropfactor>1.53</cropfactor>
<calibration>
@@ -1663,9 +1664,9 @@
<lens>
<maker>Sigma</maker>
<model>Sigma 150mm f/2.8 EX DG APO HSM Macro</model>
+ <mount>4/3 System</mount>
<focal value="150"/>
<aperture min="2.8" max="22"/>
- <mount>4/3 System</mount>
<cropfactor>2</cropfactor>
<aspect-ratio>4:3</aspect-ratio>
<calibration>
@@ -1831,8 +1832,8 @@
<mount>Nikon F AF</mount>
<mount>Sigma SA</mount>
<mount>Canon EF</mount>
- <cropfactor>1.523</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.523</cropfactor>
<calibration>
<!-- Taken with Nikon D5100 -->
<distortion model="ptlens" focal="8" a="-0.18485" b="0.5218"
c="-0.42534"/>
@@ -1848,8 +1849,8 @@
<mount>Nikon F AF</mount>
<mount>Sigma SA</mount>
<mount>Canon EF</mount>
- <cropfactor>1.620</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.620</cropfactor>
<calibration>
<!-- Taken with Canon 7D -->
<distortion model="poly3" focal="8" k1="0.00553"/>
@@ -1865,8 +1866,8 @@
<mount>Nikon F AF</mount>
<mount>Sigma SA</mount>
<mount>Canon EF</mount>
- <cropfactor>1</cropfactor>
<type>equisolid</type>
+ <cropfactor>1</cropfactor>
<calibration>
<!-- Taken with Canon 5D Mark III -->
<!-- Measured with 360° panorama -->
@@ -2207,8 +2208,8 @@
<mount>Sony Alpha</mount>
<mount>Pentax KAF2</mount>
<mount>Canon EF</mount>
- <cropfactor>1.622</cropfactor>
<type>equisolid</type>
+ <cropfactor>1.622</cropfactor>
<calibration>
<!-- Taken with Canon EOS 450D -->
<distortion model="ptlens" focal="10" a="0.01165" b="-0.04879"
c="0.09652"/>
@@ -2223,8 +2224,8 @@
<mount>Sony Alpha</mount>
<mount>Pentax KAF2</mount>
<mount>Canon EF</mount>
- <cropfactor>1.523</cropfactor>
<type>fisheye</type>
+ <cropfactor>1.523</cropfactor>
<calibration>
<!-- Taken with Nikon D200 -->
<distortion model="ptlens" focal="10" a="0.00057" b="-0.02738"
c="0.00014"/>
diff --git a/data/db/slr-soligor.xml b/data/db/slr-soligor.xml
index c23cd37..d15e81d 100644
--- a/data/db/slr-soligor.xml
+++ b/data/db/slr-soligor.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -12,4 +13,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-sony.xml b/data/db/slr-sony.xml
index 8cfdb34..5803b96 100644
--- a/data/db/slr-sony.xml
+++ b/data/db/slr-sony.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<mount>
@@ -555,8 +556,8 @@
<model>Sony AF DT 55-200mm f/4-5.6 SAM (SAL55200-2)</model>
<model lang="en">Sony AF DT 55-200mm f/4-5.6 SAM</model>
<mount>Sony Alpha</mount>
- <type>rectilinear</type>
<focal min="55" max="200"/>
+ <type>rectilinear</type>
<!-- Average crop factor of Sony APS-C cameras -->
<cropfactor>1.527</cropfactor>
<calibration>
@@ -849,4 +850,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-tamron.xml b/data/db/slr-tamron.xml
index 90a1ca4..aedf8f8 100644
--- a/data/db/slr-tamron.xml
+++ b/data/db/slr-tamron.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -400,12 +401,12 @@
<lens>
<maker>Tamron</maker>
<model>Tamron SP AF 90mm f/2.8 Di Macro 1:1</model>
- <focal value="90"/>
- <aperture min="2.8" max="32"/>
<mount>Nikon F AF</mount>
<mount>Canon EF</mount>
<mount>Pentax KAF2</mount>
<mount>Sony Alpha</mount>
+ <focal value="90"/>
+ <aperture min="2.8" max="32"/>
<!-- Average crop factor of non-Canon APS-C cameras -->
<cropfactor>1.53</cropfactor>
<calibration>
diff --git a/data/db/slr-tokina.xml b/data/db/slr-tokina.xml
index c5b5172..328ed86 100644
--- a/data/db/slr-tokina.xml
+++ b/data/db/slr-tokina.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -231,10 +232,10 @@
<mount>Minolta M</mount>
<mount>Olympus OM</mount>
<mount>Nikon F AI</mount>
- <!-- Average crop factor of non-Canon APS-C cameras -->
- <cropfactor>1.53</cropfactor>
<focal value="500"/>
<aperture value="8"/>
+ <!-- Average crop factor of non-Canon APS-C cameras -->
+ <cropfactor>1.53</cropfactor>
<calibration>
<tca model="poly3" focal="500" br="0.0000917" cr="-0.0001426"
vr="0.9998064" bb="0.0002514" cb="-0.0004149" vb="0.9997489"/>
</calibration>
@@ -297,4 +298,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-ussr.xml b/data/db/slr-ussr.xml
index cd07b64..2f102e2 100644
--- a/data/db/slr-ussr.xml
+++ b/data/db/slr-ussr.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<!--
This file contains some of the cameras and lenses from:
"Krasnogorsky zavod" JSC (http://www.zenit-foto.ru/english/index.htm)
@@ -72,10 +73,10 @@
<maker lang="ru">КМЗ</maker>
<model>MC Zenitar 2.8/16</model>
<model lang="ru">МС Зенитар 2.8/16</model>
- <type>fisheye</type>
<mount>M42</mount>
<mount>Pentax K</mount>
<mount>Nikon F</mount>
+ <type>fisheye</type>
<cropfactor>1</cropfactor>
</lens>
@@ -113,9 +114,9 @@
<model>MC Variozenitar-K 2.8-3.5/25-45</model>
<model lang="ru">МС Вариозенитар-К 2.8-3.5/25-45</model>
<mount>M42</mount>
- <cropfactor>1</cropfactor>
- <aperture min="2.8"/>
<focal min="25" max="45"/>
+ <aperture min="2.8"/>
+ <cropfactor>1</cropfactor>
</lens>
<lens>
@@ -127,9 +128,9 @@
<mount>Pentax K</mount>
<mount>Nikon F</mount>
<mount>Canon EF</mount>
- <cropfactor>1</cropfactor>
<aperture min="3.5" max="16"/>
<type>fisheye</type>
+ <cropfactor>1</cropfactor>
</lens>
<lens>
@@ -171,4 +172,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
diff --git a/data/db/slr-vivitar.xml b/data/db/slr-vivitar.xml
index 3d0f44a..9264cd5 100644
--- a/data/db/slr-vivitar.xml
+++ b/data/db/slr-vivitar.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -32,9 +33,9 @@
<mount>Canon FL</mount>
<mount>Olympus OM</mount>
<mount>M42</mount>
- <cropfactor>1.534</cropfactor>
<focal min="70" max="210"/>
<aperture min="3.5" max="22"/>
+ <cropfactor>1.534</cropfactor>
<calibration>
<!-- Taken with Sony A6000 -->
<distortion model="poly3" focal="70" k1="-0.00183"/>
diff --git a/data/db/slr-zeiss.xml b/data/db/slr-zeiss.xml
index 87572ad..7391d5e 100644
--- a/data/db/slr-zeiss.xml
+++ b/data/db/slr-zeiss.xml
@@ -1,3 +1,4 @@
+<!DOCTYPE lensdatabase SYSTEM "lensfun-database.dtd">
<lensdatabase version="2">
<lens>
@@ -37,4 +38,4 @@
</calibration>
</lens>
-</lensdatabase>
\ No newline at end of file
+</lensdatabase>
--
2.7.0
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
_______________________________________________
Lensfun-users mailing list
Lensfun-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lensfun-users
