← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to data/lensfun/slr-canon.xml

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/lensfun/slr-canon.xml
790
790
 
791
791
    <lens>
792
792
        <maker>Canon</maker>
 
793
        <model>Canon EF 70-300mm f/4-5.6 IS USM</model>
 
794
        <mount>Canon EF</mount>
 
795
        <cropfactor>1.6</cropfactor>
 
796
        <calibration>
 
797
            <distortion model="ptlens" focal="300" a="-0.00012" b="0.00556" c="-0.00398" />
 
798
            <distortion model="ptlens" focal="200" a="-0.00466" b="0.01801" c="-0.01557" />
 
799
            <distortion model="ptlens" focal="135" a="-0.00371" b="0.01433" c="-0.01464" />
 
800
            <distortion model="ptlens" focal="100" a="0" b="-0.00091" c="0" />
 
801
            <distortion model="ptlens" focal="70" a="0" b="-0.00371" c="0" />
 
802
        </calibration>
 
803
    </lens>
 
804
 
 
805
    <lens>
 
806
        <maker>Canon</maker>
793
807
        <model>Canon EF 75-300mm f/4-5.6 IS USM</model>
794
808
        <mount>Canon EF</mount>
795
809
        <cropfactor>1.6</cropfactor>