Project

General

Profile

Feature #816 » pentaxmn.cpp.diff

Abhinav Badola, 26 Mar 2012 14:19

View differences:

pentaxmn.cpp (working copy)
561 561
        { 0x0314, "smc PENTAX-F 35-80mm F4-5.6" },
562 562
        { 0x0315, "smc PENTAX-F 80-200mm F4.7-5.6" },
563 563
        { 0x0316, "smc PENTAX-F FISH-EYE 17-28mm F3.5-4.5" },
564
        { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" },
564
        { 0x0317, "smc PENTAX-F 100-300mm F4.5-5.6" },          //0
565
        { 0x0317, "Sigma AF 28-300mm F3.5-5.6 DL IF" },         //1
566
        { 0x0317, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" },   //2
565 567
        { 0x0318, "smc PENTAX-F 35-135mm F3.5-4.5" },
566
        { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina" },
568
        { 0x0319, "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina" }, //0
569
        { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },         //1
570
        { 0x0319, "Sigma 55-200mm F4-5.6 DC" },                 //2
571
        { 0x0319, "Sigma AF 28-300mm F3.5-5.6 DL IF" },         //3
572
        { 0x0319, "Sigma AF 28-300mm F3.5-6.3 DG IF Macro" },   //4
573
        { 0x0319, "Tokina 80-200mm F2.8 ATX-Pro" },             //5
567 574
        { 0x031a, "smc PENTAX-F* 250-600mm F5.6 ED[IF]" },
568
        { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" },
569
        { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
570
        { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6 DC" },
575
        { 0x031b, "smc PENTAX-F 28-80mm F3.5-4.5" },            //0
576
        { 0x031b, "Tokina AT-X Pro AF 28-70mm F2.6-2.8" },      //1
577
        { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },            //0
578
        { 0x031c, "Tokina 19-35mm F3.5-4.5 AF" },               //1
579
        { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6 DC" },//0
580
        { 0x031d, "Sigma AF 18-125mm F3.5-5.6 DC" },            //1
581
        { 0x031d, "Tokina AT-X PRO 28-70mm F2.6-2.8" },         //2
571 582
        { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
572
        { 0x031f, "smc PENTAX-F 70-210mm F4-5.6" },
583
        { 0x031f, "smc PENTAX-F 70-210mm F4-5.6" },             //0
584
        { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },          //1
585
        { 0x031f, "Takumar-F 70-210mm F4-5.6" },                //2
573 586
        { 0x0320, "smc PENTAX-F 50mm F1.4" },
574 587
        { 0x0321, "smc PENTAX-F 50mm F1.7" },
575 588
        { 0x0322, "smc PENTAX-F 135mm F2.8 [IF]" },
......
578 591
        { 0x0326, "smc PENTAX-F* 300mm F4.5 ED[IF]" },
579 592
        { 0x0327, "smc PENTAX-F* 600mm F4 ED[IF]" },
580 593
        { 0x0328, "smc PENTAX-F MACRO 100mm F2.8" },
581
        { 0x0329, "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO" },
582
        { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" },
583
        { 0x032e, "SIGMA APO 70-200mm F2.8 EX" },
594
        { 0x0329, "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO" },//0
595
        { 0x0329, "Sigma 50mm F2.8 Macro" },                    //1
596
        { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" }, //0
597
        { 0x032c, "Sigma AF 10-20mm F4-5.6 EX DC" },            //1
598
        { 0x032c, "Sigma 12-24mm F4.5 EX DG" },                 //2
599
        { 0x032c, "Sigma 17-70mm F2.8-4.5 DC Macro" },          //3
600
        { 0x032c, "Sigma 18-50mm F3.5-5.6 DC" },                //4
601
        { 0x032c, "Tamron 35-90mm F4 AF" },                     //5
602
        { 0x032e, "SIGMA APO 70-200mm F2.8 EX" },               //0
603
        { 0x032e, "Sigma APO 70-200mm F2.8 EX" },               //1
604
        { 0x032e, "Sigma EX APO 100-300mm F4 IF" },             //2
584 605
        { 0x0332, "smc PENTAX-FA 28-70mm F4 AL" },
585 606
        { 0x0333, "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO" },
586
        { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" },
607
        { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" },                //0
608
        { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)" }, //1
587 609
        { 0x0335, "smc PENTAX-FA 28-80mm F3.5-5.6 AL" },
588 610
        { 0x03f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]" },
589 611
        { 0x03f8, "smc PENTAX-DA 12-24mm F4 ED AL[IF]" },
......
592 614
        { 0x03fc, "smc PENTAX-DA 18-55mm F3.5-5.6 AL" },
593 615
        { 0x03fd, "smc PENTAX-DA 14mm F2.8 ED[IF]" },
594 616
        { 0x03fe, "smc PENTAX-DA 16-45mm F4 ED AL" },
595
        { 0x03ff, "SIGMA" },
617
        { 0x03ff, "SIGMA" },                                    //0
618
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" },               //1
619
        { 0x03ff, "Sigma DL-II 35-80mm F4-5.6" },               //2
620
        { 0x03ff, "Sigma DL Zoom 75-300mm F4-5.6" },            //3
621
        { 0x03ff, "Sigma DF EX Aspherical 28-70mm F2.8" },      //4
622
        { 0x03ff, "Sigma AF Tele 400mm F5.6 Multi-coated" },    //5
623
        { 0x03ff, "Sigma 24-60mm F2.8 EX DG" },                 //6
624
        { 0x03ff, "Sigma 70-300mm F4-5.6 Macro" },              //7
625
        { 0x03ff, "Sigma 55-200mm F4-5.6 DC" },                 //8
626
        { 0x03ff, "Sigma 18-50mm F2.8 EX DC" },                 //9
596 627
        { 0x0401, "smc PENTAX-FA SOFT 28mm F2.8" },
597 628
        { 0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6" },
598 629
        { 0x0403, "smc PENTAX-FA 43mm F1.9 Limited" },
......
606 637
        { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
607 638
        { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
608 639
        { 0x0419, "TAMRON SP AF 14mm F2.8" },
609
        { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5" },
640
        { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5" },           //0
641
        { 0x041a, "Cosina 100mm F3.5 Macro" },                  //1
610 642
        { 0x041b, "TAMRON AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO (285D)" },
611 643
        { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
612 644
        { 0x041d, "TAMRON AF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)" },
......
619 651
        { 0x0429, "TAMRON AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR [IF] MACRO (A03)" },
620 652
        { 0x042b, "smc PENTAX-FA 28-90mm F3.5-5.6" },
621 653
        { 0x042c, "smc PENTAX-FA J 75-300mm F4.5-5.8 AL" },
622
        { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR" },
654
        { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR" },   //0
655
        { 0x042d, "Tamron 28-300mm F3.5-6.3 Ultra zoom XR" },   //1
656
        { 0x042d, "Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro" },//2
623 657
        { 0x042e, "smc PENTAX-FA J 28-80mm F3.5-5.6 AL" },
624 658
        { 0x042f, "smc PENTAX-FA J 18-35mm F4-5.6 AL" },
625 659
        { 0x0431, "TAMRON SP AF 28-75mm F2.8 XR Di (A09)" },
626 660
        { 0x0433, "smc PENTAX-D FA 50mm F2.8 MACRO" },
627 661
        { 0x0434, "smc PENTAX-D FA 100mm F2.8 MACRO" },
662
        { 0x044b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
663
        { 0x04e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
664
        { 0x04e6, "Tamron SP AF 17-50mm F2.8 XR Di II" },
665
        { 0x04e7, "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]" },
666
        { 0x04ed, "Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5" },
667
        { 0x04ef, "Samsung D-XENON 12-24mm F4 ED AL [IF]" },
668
        { 0x04f3, "smc PENTAX-DA 70mm F2.4 Limited" },
628 669
        { 0x04f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
629 670
        { 0x04f5, "Schneider D-XENON 50-200mm" },
630 671
        { 0x04f6, "Schneider D-XENON 18-55mm" },
......
652 693
        { 0x050e, "smc PENTAX-FA* 250-600mm F5.6 ED[IF]" },
653 694
        { 0x050f, "smc PENTAX-FA 28-105mm F4-5.6" },
654 695
        { 0x0510, "smc PENTAX-FA 100-300mm F4.5-5.6" },
696
        { 0x0562, "smc PENTAX-FA 100-300mm F4.5-5.6" },
655 697
        { 0x0601, "smc PENTAX-FA* 85mm F1.4[IF]" },
656 698
        { 0x0602, "smc PENTAX-FA* 200mm F2.8 ED[IF]" },
657 699
        { 0x0603, "smc PENTAX-FA* 300mm F2.8 ED[IF]" },
......
665 707
        { 0x060d, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
666 708
        { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
667 709
        { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
710
        { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
668 711
        { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
712
        { 0x07d6, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
713
        { 0x07d8, "smc PENTAX-DA L 55-300mm F4-5.8 ED" },
669 714
        { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
670 715
        { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
671 716
        { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]" },
717
        { 0x07dd, "smc PENTAX-DA L 50-200mm F4-5.6 ED" },
672 718
        { 0x07de, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
673 719
        { 0x07df, "Samsung D-XENON 18-55mm F3.5-5.6 II" },
674 720
        { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
675 721
        { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
722
        { 0x07e2, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
723
        { 0x07e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM (SDM unused)" },
676 724
        { 0x07e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
677 725
        { 0x07e6, "Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)" },
678 726
        { 0x07e7, "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]" },
......
685 733
        { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not used)" },
686 734
        { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
687 735
        { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
736
        { 0x0804, "Sigma 50mm F1.4 EX DG HSM" },
737
        { 0x080c, "Sigma 70-300mm F4-5.6 DG OS" },
738
        { 0x080d, "Sigma 120-400mm F4.5-5.6 APO DG OS HSM" },
739
        { 0x080e, "Sigma 17-70mm F2.8-4.0 DC Macro OS HSM" },
740
        { 0x080f, "Sigma 150-500mm F5-6.3 APO DG OS HSM" },
741
        { 0x0810, "Sigma 70-200mm F2.8 EX DG Macro HSM II" },
742
        { 0x0811, "Sigma 50-500mm F4.5-6.3 DG OS HSM" },
743
        { 0x0812, "Sigma 8-16mm F4.5-5.6 DC HSM" },
744
        { 0x0815, "Sigma 17-50mm F2.8 EX DC OS HSM" },
745
        { 0x0816, "Sigma 85mm F1.4 EX DG HSM" },
746
        { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
688 747
        { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
689 748
        { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
690 749
        { 0x08e8, "smc PENTAX-DA 17-70mm F4 AL [IF] SDM" },
......
692 751
        { 0x08eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM" },
693 752
        { 0x08f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM" },
694 753
        { 0x08f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM" },
754
        { 0x08ff, "Sigma Lens (8 255)" },                   //0
755
        { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" },//1
756
        { 0x08ff, "Sigma APO 150-500mm F5-6.3 DG OS HSM" }, //2
757
        { 0x08ff, "Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye" },//3
758
        { 0x08ff, "Sigma 50-200mm F4-5.6 DC OS" },          //4
759
        { 0x0900, "645 Manual Lens" },
695 760
        { 0x0b04, "smc PENTAX-FA645 Zoom 45mm-85mm F4.5" },
696 761
        { 0x0b07, "smc PENTAX-FA645 Macro 120mm F4" },
762
        { 0x0b08, "smc PENTAX-FA 645 80-160mm F4.5" },
763
        { 0x0b0b, "smc PENTAX-FA 645 35mm F3.5 AL [IF]" },
697 764
        { 0x0b11, "smc PENTAX-FA645 Zoom 150mm-300mm F5.6 ED [IF]" },
765
        { 0x0b12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
766
        { 0x1500, "Pentax Q manual lens" },
767
        { 0x1501, "01 Standard Prime 8.5mm F1.9" },
768
        { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" },
769
        { 0x1503, "03 Fish-eye 3.2mm F5.6" },
770
        { 0x1504, "04 Toy Lens Wide 6.3mm F7.1" },
771
        { 0x1505, "05 Toy Lens Telephoto 18mm F8" },
772

  
698 773
    };
699 774

  
775
    //! A lens id and a pretty-print function for special treatment of the id.
776
        struct LensIdFct {
777
            long     id_;                           //!< Lens id
778
            int     dummy;                          //A Dummy variable /* TODO: Decoding missing */
779
            //! Comparison operator for find template
780
          bool operator==(long id) const { return id_ == id; }
781
        };
782

  
783
        int exactLensInfo() { return 0;}            /* TODO: Decoding missing */
784

  
785
    //! List of lens ids which require special treatment with the medicine
786
    const LensIdFct lensIdFct[] = {
787
        {   0x0317, exactLensInfo() },
788
        {   0x0319, exactLensInfo() },
789
        {   0x031b, exactLensInfo() },
790
        {   0x031c, exactLensInfo() },
791
        {   0x031d, exactLensInfo() },
792
        {   0x031f, exactLensInfo() },
793
        {   0x0329, exactLensInfo() },
794
        {   0x032c, exactLensInfo() },
795
        {   0x032e, exactLensInfo() },
796
        {   0x0334, exactLensInfo() },
797
        {   0x03ff, exactLensInfo() },
798
        {   0x041a, exactLensInfo() },
799
        {   0x042d, exactLensInfo() },
800
        {   0x08ff, exactLensInfo() },
801
    };
802

  
700 803
    //! ImageTone, tag 0x004f
701 804
    extern const TagDetails pentaxImageTone[] = {
702 805
        {    0, N_("Natural") },
(2-2/9)