Changeset 5038 for extensions/AMetaData/JpegMetaData/TagDefinitions
- Timestamp:
- Mar 3, 2010, 9:55:15 PM (15 years ago)
- Location:
- extensions/AMetaData/JpegMetaData/TagDefinitions
- Files:
-
- 3 edited
-
MagicTags.class.php (modified) (1 diff)
-
NikonTags.class.php (modified) (7 diffs)
-
PentaxTags.class.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/JpegMetaData/TagDefinitions/MagicTags.class.php
r5004 r5038 146 146 'tagValues' => Array( 147 147 "{exif.Pentax.LensType}", 148 "{exif.Nikon.LensData}", 148 149 "{exif.Nikon.Lens}", 149 150 "{exif.Canon.CanonCameraSettings.LensType}", -
extensions/AMetaData/JpegMetaData/TagDefinitions/NikonTags.class.php
r4931 r5038 679 679 'tagName' => "LensData", 680 680 'schema' => "Nikon", 681 'translatable'=> true,681 'translatable'=> false, 682 682 'combiTag' => 0, 683 683 'implemented' => true, … … 734 734 '2D 48 80 80 30 30 21 02' => 'AF Micro-Nikkor 200mm f/4D IF-ED', 735 735 '2E 48 5C 82 30 3C 28 02' => 'AF Nikkor 70-210mm f/4-5.6D', 736 '2F 48 30 44 24 24 29 02' => 'AF Zoom-Nikkor 20-35mm f/2.8D IF', //doublon? 736 '2F 48 30 44 24 24 29 02' => Array( 737 /* 738 * Different lenses can have the same Id. 739 * The Nikon Id are made with the focal min/max and the aperture 740 * min/max values. 741 * 742 * So, it's not possible to apply the method used with the Canon 743 * lens Id. 744 * 745 * For multiple lenses with the same key, the method used is to 746 * return the first lens 747 */ 748 'AF Zoom-Nikkor 20-35mm f/2.8D IF', 749 'Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)', 750 ), 737 751 '30 48 98 98 24 24 24 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED', 738 752 '30 48 98 98 24 24 F1 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E', … … 740 754 '30 48 98 98 24 24 F2 02' => 'AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E', 741 755 '31 54 56 56 24 24 25 02' => 'AF Micro-Nikkor 60mm f/2.8D', 742 '32 54 6A 6A 24 24 35 02' => 'AF Micro-Nikkor 105mm f/2.8D', //doublon? 756 757 '32 54 6A 6A 24 24 35 02' => Array( 758 'AF Micro-Nikkor 105mm f/2.8D', 759 'Sigma Macro 105mm f/2.8 EX DG', 760 ), 743 761 '33 48 2D 2D 24 24 31 02' => 'AF Nikkor 18mm f/2.8D', 744 762 '34 48 29 29 24 24 32 02' => 'AF Fisheye Nikkor 16mm f/2.8D', … … 816 834 '78 40 37 6E 2C 3C 7C 0E' => 'AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED', 817 835 '79 40 3C 80 2C 3C 7F 06' => 'AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED', 818 '7A 3C 1F 37 30 30 7E 06' => 'AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED', //doublon ? 836 '7A 3C 1F 37 30 30 7E 06' => Array( 837 'AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED', 838 'Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)', 839 ), 819 840 '7B 48 80 98 30 30 80 0E' => 'AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED', 820 841 '7D 48 2B 53 24 24 82 06' => 'AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED', … … 874 895 '79 48 5C 5C 24 24 1C 06' => 'Sigma Macro 70mm F2.8 EX DG', 875 896 '02 48 65 65 24 24 02 00' => 'Sigma 90mm F2.8 Macro', 876 '32 54 6A 6A 24 24 35 02' => 'Sigma Macro 105mm F2.8 EX DG', //doublon ?877 897 'E5 54 6A 6A 24 24 35 02' => 'Sigma Macro 105mm F2.8 EX DG', 878 898 '48 48 76 76 24 24 4B 06' => 'Sigma 150mm F2.8 EX DG APO Macro HSM', … … 1005 1025 '00 48 1C 29 24 24 00 06' => 'Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)', 1006 1026 '00 3C 1F 37 30 30 00 06' => 'Tokina AT-X 124 AF PRO DX (AF 12-24mm f/4)', 1007 '7A 3C 1F 37 30 30 7E 06' => 'Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4)', //doublon ?1008 1027 '00 48 29 50 24 24 00 06' => 'Tokina AT-X 165 PRO DX (AF 16-50mm f/2.8)', 1009 1028 '00 40 2A 72 2C 3C 00 06' => 'Tokina AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)', 1010 '2F 48 30 44 24 24 29 02' => 'Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8)', //doublon ?1011 1029 '2F 40 30 44 2C 34 29 02' => 'Tokina AF 235 II (AF 20-35mm f/3.5-4.5)', 1012 1030 '25 48 3C 5C 24 24 1B 02' => 'Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)', … … 1081 1099 // SerialNumber, tag 0x00a0 1082 1100 0x00a0 => Array( 1083 'tagName' => "SerialNumber ",1101 'tagName' => "SerialNumber2", 1084 1102 'schema' => "Nikon", 1085 1103 'translatable'=> false, -
extensions/AMetaData/JpegMetaData/TagDefinitions/PentaxTags.class.php
r4931 r5038 862 862 'combiTag' => 2, 863 863 'implemented' => true, 864 'tagValues ' => Array(864 'tagValues.special' => Array( 865 865 0x0000 => "M-42 or No Lens", 866 866 0x0100 => "K,M Lens", 867 867 0x0200 => "A Series Lens", 868 0x0300 => "S IGMA",868 0x0300 => "Sigma", 869 869 0x0311 => "smc PENTAX-FA SOFT 85mm F2.8", 870 870 0x0312 => "smc PENTAX-F 1.7X AF ADAPTER", … … 873 873 0x0315 => "smc PENTAX-F 80-200mm F4.7-5.6", 874 874 0x0316 => "smc PENTAX-F FISH-EYE 17-28mm F3.5-4.5", 875 0x0317 => "smc PENTAX-F 100-300mm F4.5-5.6", 875 0x0317 => Array( 876 "smc PENTAX-F 100-300mm F4.5-5.6", 877 "Sigma AF 28-300mm F3.5-5.6 DL IF", 878 "Sigma AF 28-300mm F3.5-6.3 DG IF Macro", 879 ), 876 880 0x0318 => "smc PENTAX-F 35-135mm F3.5-4.5", 877 0x0319 => "smc PENTAX-F 35-105mm F4-5.6 or SIGMA or Tokina", 881 0x0319 => Array( 882 "smc PENTAX-F 35-105mm F4-5.6", 883 "Sigma AF 28-300mm F3.5-5.6 DL IF", 884 "Sigma 55-200mm F4-5.6 DC", 885 "Sigma AF 28-300mm F3.5-5.6 DL IF", 886 "Sigma AF 28-300mm F3.5-6.3 DG IF Macro", 887 "Tokina 80-200mm F2.8 ATX-Pro", 888 ), 878 889 0x031a => "smc PENTAX-F* 250-600mm F5.6 ED[IF]", 879 0x031b => "smc PENTAX-F 28-80mm F3.5-4.5", 880 0x031c => "smc PENTAX-F 35-70mm F3.5-4.5", 881 0x031d => "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6 DC", 890 0x031b => Array( 891 "smc PENTAX-F 28-80mm F3.5-4.5", 892 "Tokina AT-X Pro AF 28-70mm F2.6-2.8", 893 ), 894 0x031c => Array( 895 "smc PENTAX-F 35-70mm F3.5-4.5", 896 "Tokina 19-35mm F3.5-4.5 AF", 897 ), 898 0x031d => Array( 899 "PENTAX-F 28-80mm F3.5-4.5", 900 "Sigma AF 18-125mm F3.5-5.6 DC", 901 "Tokina AT-X PRO 28-70mm F2.6-2.8", 902 ), 882 903 0x031e => "PENTAX-F 70-200mm F4-5.6", 883 0x031f => "smc PENTAX-F 70-210mm F4-5.6", 904 0x031f => Array( 905 "smc PENTAX-F 70-210mm F4-5.6", 906 "Tokina AF 730 75-300mm F4.5-5.6", 907 "Takumar-F 70-210mm F4-5.6", 908 ), 884 909 0x0320 => "smc PENTAX-F 50mm F1.4", 885 910 0x0321 => "smc PENTAX-F 50mm F1.7", 886 911 0x0322 => "smc PENTAX-F 135mm F2.8 [IF]", 887 912 0x0323 => "smc PENTAX-F 28mm F2.8", 888 0x0324 => "S IGMA20mm F1.8 EX DG ASPHERICAL RF",913 0x0324 => "Sigma 20mm F1.8 EX DG ASPHERICAL RF", 889 914 0x0326 => "smc PENTAX-F* 300mm F4.5 ED[IF]", 890 915 0x0327 => "smc PENTAX-F* 600mm F4 ED[IF]", 891 916 0x0328 => "smc PENTAX-F MACRO 100mm F2.8", 892 0x0329 => "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO", 893 0x032c => "Tamron 35-90mm F4 AF or various SIGMA models", 894 0x032e => "SIGMA APO 70-200mm F2.8 EX", 917 0x0329 => Array( 918 "smc PENTAX-F MACRO 50mm F2.8", 919 "Sigma 50mm F2.8 Macro", 920 ), 921 0x032c => Array( 922 "Tamron 35-90mm F4 AF", 923 "Sigma AF 10-20mm F4-5.6 EX DC", 924 "Sigma 12-24mm F4.5 EX DG", 925 "Sigma 17-70mm F2.8-4.5 DC Macro", 926 "Sigma 18-50mm F3.5-5.6 DC", 927 ), 928 0x032e => Array( 929 "Sigma APO 70-200mm F2.8 EX", 930 "Sigma EX APO 100-300mm F4 IF", 931 ), 895 932 0x0332 => "smc PENTAX-FA 28-70mm F4 AL", 896 0x0333 => "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO", 897 0x0334 => "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]", 933 0x0333 => "Sigma 28mm F1.8 EX DG ASPHERICAL MACRO", 934 0x0334 => Array( 935 "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]", 936 "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)", 937 ), 898 938 0x0335 => "smc PENTAX-FA 28-80mm F3.5-5.6 AL", 899 939 0x03f7 => "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]", … … 904 944 0x03fd => "smc PENTAX-DA 14mm F2.8 ED[IF]", 905 945 0x03fe => "smc PENTAX-DA 16-45mm F4 ED AL", 906 0x03ff => "SIGMA", 946 0x03ff => Array( 947 "Sigma 18-200mm F3.5-6.3 DC", 948 "Sigma DL-II 35-80mm F4-5.6", 949 "Sigma DL Zoom 75-300mm F4-5.6", 950 "Sigma DF EX Aspherical 28-70mm F2.8", 951 "Sigma AF Tele 400mm F5.6 Multi-coated", 952 "Sigma 24-60mm F2.8 EX DG", 953 "Sigma 70-300mm F4-5.6 Macro", 954 "Sigma 55-200mm F4-5.6 DC", 955 "Sigma 18-50mm F2.8 EX DC", 956 ), 907 957 0x0401 => "smc PENTAX-FA SOFT 28mm F2.8", 908 958 0x0402 => "smc PENTAX-FA 80-320mm F4.5-5.6", … … 911 961 0x040c => "smc PENTAX-FA 50mm F1.4", 912 962 0x040f => "smc PENTAX-FA 28-105mm F4-5.6 [IF]", 913 0x0410 => "T AMRONAF 80-210mm F4-5.6 (178D)",914 0x0413 => "T AMRONSP AF 90mm F2.8 (172E)",963 0x0410 => "Tamron AF 80-210mm F4-5.6 (178D)", 964 0x0413 => "Tamron SP AF 90mm F2.8 (172E)", 915 965 0x0414 => "smc PENTAX-FA 28-80mm F3.5-5.6", 916 966 0x0416 => "TOKINA 28-80mm F3.5-5.6", 917 967 0x0417 => "smc PENTAX-FA 20-35mm F4 AL", 918 968 0x0418 => "smc PENTAX-FA 77mm F1.8 Limited", 919 0x0419 => "TAMRON SP AF 14mm F2.8", 920 0x041a => "smc PENTAX-FA MACRO 100mm F3.5", 921 0x041b => "TAMRON AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO (285D)", 969 0x0419 => "Tamron SP AF 14mm F2.8", 970 0x041a => Array( 971 "smc PENTAX-FA MACRO 100mm F3.5", 972 "Cosina 100mm F3.5 Macro", 973 ), 974 0x041b => "Tamron AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO (285D)", 922 975 0x041c => "smc PENTAX-FA 35mm F2 AL", 923 0x041d => "T AMRONAF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)",976 0x041d => "Tamron AF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)", 924 977 0x0422 => "smc PENTAX-FA 24-90mm F3.5-4.5 AL[IF]", 925 978 0x0423 => "smc PENTAX-FA 100-300mm F4.7-5.8", 926 0x0424 => "T AMRONAF70-300mm F/4-5.6 LD MACRO",927 0x0425 => "T AMRONSP AF 24-135mm F3.5-5.6 AD AL (190D)",979 0x0424 => "Tamron AF70-300mm F/4-5.6 LD MACRO", 980 0x0425 => "Tamron SP AF 24-135mm F3.5-5.6 AD AL (190D)", 928 981 0x0426 => "smc PENTAX-FA 28-105mm F3.2-4.5 AL[IF]", 929 982 0x0427 => "smc PENTAX-FA 31mm F1.8AL Limited", 930 0x0429 => "T AMRONAF 28-200mm Super Zoom F3.8-5.6 Aspherical XR [IF] MACRO (A03)",983 0x0429 => "Tamron AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR [IF] MACRO (A03)", 931 984 0x042b => "smc PENTAX-FA 28-90mm F3.5-5.6", 932 985 0x042c => "smc PENTAX-FA J 75-300mm F4.5-5.8 AL", 933 0x042d => "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR", 986 0x042d => Array( 987 "Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro", 988 "Tamron 28-300mm F3.5-6.3 Ultra zoom XR", 989 ), 934 990 0x042e => "smc PENTAX-FA J 28-80mm F3.5-5.6 AL", 935 991 0x042f => "smc PENTAX-FA J 18-35mm F4-5.6 AL", 936 0x0431 => "T AMRONSP AF 28-75mm F2.8 XR Di (A09)",992 0x0431 => "Tamron SP AF 28-75mm F2.8 XR Di (A09)", 937 993 0x0433 => "smc PENTAX-D FA 50mm F2.8 MACRO", 938 994 0x0434 => "smc PENTAX-D FA 100mm F2.8 MACRO", … … 949 1005 0x04f7 => "smc PENTAX-DA 10-17mm F3.5-4.5 ED [IF] Fisheye zoom", 950 1006 0x04f8 => "smc PENTAX-DA 12-24mm F4 ED AL [IF]", 951 0x04f9 => "T AMRONXR DiII 18-200mm F3.5-6.3 (A14)",1007 0x04f9 => "Tamron XR DiII 18-200mm F3.5-6.3 (A14)", 952 1008 0x04fa => "smc PENTAX-DA 50-200mm F4-5.6 ED", 953 1009 0x04fb => "smc PENTAX-DA 40mm F2.8 Limited", … … 998 1054 0x07e7 => "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]", 999 1055 0x07e9 => "smc PENTAX-DA 35mm F2.8 Macro Limited", 1000 0x07ea => "smc PENTAX-DA* 300 1056 0x07ea => "smc PENTAX-DA* 300mm F4ED [IF] SDM (SDM not used)", 1001 1057 0x07eb => "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM (SDM not used)", 1002 1058 0x07ec => "smc PENTAX-DA 55-300mm F4-5.8 ED", //from exiftool 1003 0x07ee => "T AMRONAF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO",1059 0x07ee => "Tamron AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO", 1004 1060 0x07f1 => "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM (SDM not used)", 1005 1061 0x07f2 => "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not used)", … … 1009 1065 0x08e3 => "smc PENTAX DA* 60-250mm F4 [IF] SDM", //from exiftool 1010 1066 0x08e8 => "smc PENTAX-DA 17-70mm F4 AL [IF] SDM", //from exiftool 1011 0x08ea => "smc PENTAX-DA* 300 1067 0x08ea => "smc PENTAX-DA* 300mm F4ED [IF] SDM", 1012 1068 0x08eb => "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM", 1013 1069 0x08f1 => "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM", 1014 1070 0x08f2 => "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM", 1015 0x08ff => "Sigma lens" //from exiftool 1016 ) 1071 0x08ff => Array( 1072 "Sigma 70-200mm F2.8 EX DG Macro HSM II", 1073 "Sigma APO 150-500mm F5-6.3 DG OS HSM", 1074 ), 1075 0xffff => "Unknown", 1076 ), 1017 1077 ), // < LensType 1018 1078
Note: See TracChangeset
for help on using the changeset viewer.
