Project

General

Profile

Adding ID's to Pentax Makernotes? (with patch) ยป extendedID-pentaxmn.patch

S. Verdoold, 03 Jan 2013 14:42

View differences:

./trunk/src/pentaxmn.cpp 2013-01-03 23:02:34.787224690 +0100
65 65
        {    0x12958, N_("Optio 330GS") },
66 66
        {    0x12962, N_("Optio 450/550") },
67 67
        {    0x1296c, N_("Optio S") },
68
        {    0x12971, N_("Optio S V1.01") },
68 69
        {    0x12994, N_("*ist D") },
69 70
        {    0x129b2, N_("Optio 33L") },
70 71
        {    0x129bc, N_("Optio 33LF") },
......
111 112
        {    0x12c32, N_("Optio M20") },
112 113
        {    0x12c3c, N_("Optio W20") },
113 114
        {    0x12c46, N_("Optio A20") },
114
        {    0x12c8c, N_("Optio M30") },
115
//        {    0x12c8c, N_("Optio M30") },
115 116
        {    0x12c78, N_("Optio E30") },
116 117
        {    0x12c7d, N_("Optio E35") },
117 118
        {    0x12c82, N_("Optio T30") },
119
        {    0x12c8c, N_("Optio M30") },
120
        {    0x12c91, N_("Optio L30") },
118 121
        {    0x12c96, N_("Optio W30") },
119 122
        {    0x12ca0, N_("Optio A30") },
120 123
        {    0x12cb4, N_("Optio E40") },
121 124
        {    0x12cbe, N_("Optio M40") },
125
        {    0x12cc3, N_("Optio L40") },
126
        {    0x12cc5, N_("Optio L36") },
122 127
        {    0x12cc8, N_("Optio Z10") },
123 128
        {    0x12cd2, N_("K20D") },
124 129
        {    0x12cd4, N_("Samsung GX20") },
......
129 134
        {    0x12d04, N_("Optio S12") },
130 135
        {    0x12d0e, N_("Optio E50") },
131 136
        {    0x12d18, N_("Optio M50") },
137
        {    0x12d22, N_("Optio L50") },
132 138
        {    0x12d2c, N_("Optio V20") },
133 139
        {    0x12d40, N_("Optio W60") },
134 140
        {    0x12d4a, N_("Optio M60") },
135
        {    0x12d68, N_("Optio E60") },
141
        {    0x12d68, N_("Optio E60/M90") },
136 142
        {    0x12d72, N_("K2000") },
137 143
        {    0x12d73, N_("K-m") },
138 144
        {    0x12d86, N_("Optio P70") },
145
        {    0x12d90, N_("Optio L70") },
139 146
        {    0x12d9a, N_("Optio E70") },
140 147
        {    0x12dae, N_("X70") },
141 148
        {    0x12db8, N_("K-7") },
......
144 151
        {    0x12df4, N_("Optio WS80") },
145 152
        {    0x12dfe, N_("K-x") },
146 153
        {    0x12e08, N_("645D") },
154
        {    0x12e12, N_("Optio E80") },
155
        {    0x12e30, N_("Optio W90") },
147 156
        {    0x12e3a, N_("Optio I-10") },
157
        {    0x12e44, N_("Optio H90") },
158
        {    0x12e4e, N_("Optio E90") },
159
        {    0x12e58, N_("X90") },
160
        {    0x12e6c, N_("K-r") },
161
        {    0x12e76, N_("K-5") },
162
        {    0x12e8a, N_("Optio RS1000/RS1500") },
163
        {    0x12e94, N_("Optio RZ10") },
164
        {    0x12e9e, N_("Optio LS1000") },
165
        {    0x12ebc, N_("Optio WG-1 GPS") },
166
        {    0x12ed0, N_("Optio S1") },
167
        {    0x12ee4, N_("Q") },
168
        {    0x12ef8, N_("K-01") },
169
        {    0x12f0c, N_("Optio RZ18") },
170
        {    0x12f16, N_("Optio VS20") },
171
        {    0x12f2a, N_("Optio WG-2 GPS") },
172
        {    0x12f48, N_("Optio LS465") },
173
        {    0x12f52, N_("K-30") },
174
        {    0x12f5c, N_("X-5") },
175
        {    0x12f66, N_("Q10") },
176
        {    0x12f70, N_("K-5 II") },
177
        {    0x12f71, N_("K-5 II s") },
148 178
    };
149 179

  
150 180
    //! Quality, tag 0x0008
......
155 185
        {   3, N_("TIFF") },
156 186
        {   4, N_("RAW") },
157 187
        {   5, N_("Premium") },
188
        {   65535, N_("n/a") },
158 189
    };
159 190

  
160 191
    //! Size, tag 0x0009
......
175 206
        {    23, N_("3056x2296") },
176 207
        {    25, N_("2816x2212 or 2816x2112") },
177 208
        {    27, N_("3648x2736") },
209
        {    29, N_("4000x3000") },
210
        {    30, N_("4288x3216") },
211
        {    31, N_("4608x3456") },
212
        {    129, N_("1920x1080") },
213
        {    135, N_("4608x2592") },
214
        {    257, N_("3216x3216") },
215
// not sure what to do with these values:
216
//    '0 0' = 2304x1728
217
//    '4 0' = 1600x1200
218
//    '5 0' = 2048x1536
219
//    '8 0' = 2560x1920
220
//    '32 2' = 960x640
221
//    '33 2' = 1152x768
222
//    '34 2' = 1536x1024
223
//    '35 1' = 2400x1600
224
//    '36 0' = 3008x2008 or 3040x2024
225
//    '37 0' = 3008x2000
178 226
    };
179 227

  
180 228
    //! Flash, tag 0x000c
181 229
    extern const TagDetails pentaxFlash[] = {
182 230
        {    0x000, N_("Auto, Did not fire") },
183
        {    0x001, N_("Off") },
231
        {    0x001, N_("Off, Did not fire") },
232
        {    0x002, N_("Off, Did not fire") },
184 233
        {    0x003, N_("Auto, Did not fire, Red-eye reduction") },
234
        {    0x005, N_("On. Did not fire. Wireless (Master)") },
185 235
        {    0x100, N_("Auto, Fired") },
186
        {    0x102, N_("On") },
236
        {    0x102, N_("On, Fired") },
187 237
        {    0x103, N_("Auto, Fired, Red-eye reduction") },
188 238
        {    0x104, N_("On, Red-eye reduction") },
189
        {    0x105, N_("On, Wireless") },
239
        {    0x105, N_("On, Wireless (Master)") },
240
        {    0x106, N_("On, Wireless (Control)") },
190 241
        {    0x108, N_("On, Soft") },
191 242
        {    0x109, N_("On, Slow-sync") },
192 243
        {    0x10a, N_("On, Slow-sync, Red-eye reduction") },
193 244
        {    0x10b, N_("On, Trailing-curtain Sync") },
245
// exiftool recognises 2 values, the values here correpond with Value 0
194 246
    };
195 247

  
196 248
    //! Focus, tag 0x000d
......
204 256
        {    16, N_("AF-S") },
205 257
        {    17, N_("AF-C") },
206 258
        {    18, N_("AF-A") },
259
        {    32, N_("Contrast-detect") },
260
        {    33, N_("Tracking Contrast-detect") },
261
        {    288, N_("Face Detect") },
207 262
    };
208 263

  
209 264
    //! AFPoint, tag 0x000e
......
212 267
        {    0xfffe, N_("Fixed Center") },
213 268
        {    0xfffd, N_("Automatic Tracking AF") },
214 269
        {    0xfffc, N_("Face Recognition AF") },
270
        {    0xfffb, N_("AF Select") },
271
        {    0, N_("None") },
215 272
        {    1, N_("Upper-left") },
216 273
        {    2, N_("Top") },
217 274
        {    3, N_("Upper-right") },
......
264 321
        {    22, N_("4000") },
265 322
        {    23, N_("5000") },
266 323
        {    24, N_("6400") },
324
        {    25, N_("8000") },
325
        {    26, N_("10000") },
326
        {    27, N_("12800") },
327
        {    28, N_("16000") },
328
        {    29, N_("20000") },
329
        {    30, N_("25600") },
330
        {    31, N_("32000") },
331
        {    32, N_("40000") },
332
        {    33, N_("51200") },
267 333
        {    50, N_("50") },
268 334
        {    100, N_("100") },
269 335
        {    200, N_("200") },
270
        {    268, N_("200") },
336
//        {    268, N_("200") },
271 337
        {    400, N_("400") },
272 338
        {    800, N_("800") },
273 339
        {    1600, N_("1600") },
......
285 351
        {    268, N_("1600") },
286 352
        {    269, N_("2200") },
287 353
        {    270, N_("3200") },
354
        {    271, N_("4500") },
355
        {    272, N_("6400") },
356
        {    273, N_("9000") },
357
        {    274, N_("12800") },
358
        {    275, N_("18000") },
359
        {    276, N_("25600") },
360
        {    277, N_("36000") },
361
        {    278, N_("51200") },
362

  
288 363
    };
289 364

  
290 365
    //! Generic for Off/On switches
......
319 394
        {    8, N_("WhiteFluorescent") },
320 395
        {    9, N_("Flash") },
321 396
        {    10, N_("Cloudy") },
397
        {    15, N_("Color Temperature Enhancement") },
322 398
        {    17, N_("Kelvin") },
323 399
        {    65534, N_("Unknown") },
324 400
        {    65535, N_("User Selected") },
......
330 406
        {    2, N_("Auto (Shade)") },
331 407
        {    3, N_("Auto (Flash)") },
332 408
        {    4, N_("Auto (Tungsten)") },
409
        {    6, N_("Auto (DaylightFluorescent)") },
333 410
        {    7, N_("Auto (DaywhiteFluorescent)") },
334 411
        {    8, N_("Auto (WhiteFluorescent)") },
335 412
        {    10, N_("Auto (Cloudy)") },
......
346 423
        {     4, N_("Med High")  },
347 424
        {     5, N_("Very Low")  },
348 425
        {     6, N_("Very High") },
426
        {     7, N_("-4") },
427
        {     8, N_("+4") },
349 428
        { 65535, N_("None")      },
350 429
        { 65535, N_("None")      }              // To silence compiler warning
351 430
    };
......
359 438
        {    4, N_("Med High") },
360 439
        {    5, N_("Very Low") },
361 440
        {    6, N_("Very High") },
441
        {    7, N_("-4") },
442
        {    8, N_("+4") },
362 443
    };
363 444

  
364 445
    //! Sharpness, tag 0x0021
......
370 451
        {    4, N_("Med Hard") },
371 452
        {    5, N_("Very Soft") },
372 453
        {    6, N_("Very Hard") },
454
        {    7, N_("-4") },
455
        {    8, N_("+4") },
373 456
    };
374 457

  
375 458
    //! Location, tag 0x0022
......
452 535
        {    69, N_("Stockholm") },
453 536
        {    70, N_("Lisbon") },
454 537
        {    71, N_("Copenhagen") },
538
        {    72, N_("Warsaw") },
539
        {    73, N_("Prague") },
540
        {    74, N_("Budapest") },
455 541
    };
456 542

  
457 543
    //! ImageProcessing, combi-tag 0x0032 (4 bytes)
458 544
    extern const TagDetails pentaxImageProcessing[] = {
459 545
        { 0x00000000, N_("Unprocessed") },
460 546
        { 0x00000004, N_("Digital Filter") },
547
        { 0x01000000, N_("Resized") },
461 548
        { 0x02000000, N_("Cropped") },
462 549
        { 0x04000000, N_("Color Filter") },
550
        { 0x06000000, N_("Digital Filter 6") },
463 551
        { 0x10000000, N_("Frame Synthesis?") }
464 552
    };
465 553

  
466 554
    //! PictureMode, combi-tag 0x0033 (3 bytes)
467 555
    extern const TagDetails pentaxPictureMode[] = {
468 556
        { 0x000000, N_("Program") },
557
        { 0x000100, N_("Hi-speed Program") },
558
        { 0x000200, N_("DOF Program") },
469 559
        { 0x000300, N_("MTF Program") },
470 560
        { 0x000400, N_("Standard") },
471 561
        { 0x000500, N_("Portrait") },
......
486 576
        { 0x001300, N_("Food") },
487 577
        { 0x001400, N_("Stage Lighting") },
488 578
        { 0x001500, N_("Night Snap") },
579
        { 0x001700, N_("Blue Sky") },
580
        { 0x001800, N_("Sunset") },
581
        { 0x001a00, N_("Night Scene HDR") },
582
        { 0x001b00, N_("HDR") },
583
        { 0x001c00, N_("Quick Macro") },
584
        { 0x001d00, N_("Forest") },
585
        { 0x001e00, N_("Backlight Silhouette") },
489 586
        /* AUTO PICT modes (auto-selected) */
490 587
        { 0x010400, N_("Auto PICT (Standard)") },
491 588
        { 0x010500, N_("Auto PICT (Portrait)") },
......
504 601
        { 0x020101, N_("Hi-speed Program") },
505 602
        { 0x020201, N_("DOF Program") },
506 603
        { 0x020301, N_("MTF Program") },
604
        { 0x021601, N_("Shallow DOF") },
507 605
        { 0x030001, N_("Green Mode") },
508 606
        { 0x040001, N_("Shutter Speed Priority") },
509 607
        { 0x050001, N_("Aperture Priority") },
......
522 620
        { 0x0f0001, N_("Sensitivity Priority AE (1)") },
523 621
        { 0x100000, N_("Flash X-Sync Speed AE") },
524 622
        { 0x100001, N_("Flash X-Sync Speed AE (1)") },
623
        { 0x120001, N_("Auto Program (Normal)") },
624
        { 0x120101, N_("Auto Program (Hi-Speed)") },
625
        { 0x120201, N_("Auto Program (DOF)") },
626
        { 0x120301, N_("Auto Program (MTF)") },
627
        { 0x121601, N_("Auto Program (Shallow DOF)") },
628
        { 0x141601, N_("Blur control") },
525 629
        /* other modes */
526 630
        { 0x000001, N_("Program") },
527 631
        { 0xfe0000, N_("Video (30 fps)") },
......
534 638
        { 0x01000000, N_("Continuous") },
535 639
        { 0x02000000, N_("Continuous (Hi)") },
536 640
        { 0x03000000, N_("Burst") },
641
        { 0xff000000, N_("Video") },
537 642
        { 0x00100000, N_("Single-frame") }, /* on 645D */
538 643
        { 0x00010000, N_("Self-timer (12 sec)") },
539 644
        { 0x00020000, N_("Self-timer (2 sec)") },
645
        { 0x000f0000, N_("Video") },
646
        { 0x00100000, N_("Mirror Lock-up") },
540 647
        { 0x00000100, N_("Remote Control (3 sec)") },
541 648
        { 0x00000200, N_("Remote Control") },
649
        { 0x00000400, N_("Remote Continuous Shooting") },
542 650
        { 0x00000001, N_("Multiple Exposure") },
651
        { 0x00000010, N_("HDR") },
652
        { 0x00000020, N_("HDR Strong 1") },
653
        { 0x00000030, N_("HDR Strong 2") },
654
        { 0x00000040, N_("HDR Strong 3") },
655
        { 0x000000e0, N_("HDR Auto") },
543 656
        { 0x000000ff, N_("Video") },
544 657
    };
545 658

  
......
577 690
        { 0x031c, "smc PENTAX-F 35-70mm F3.5-4.5" },
578 691
        { 0x031d, "PENTAX-F 28-80mm F3.5-4.5 or SIGMA AF 18-125mm F3.5-5.6 DC" },
579 692
        { 0x031e, "PENTAX-F 70-200mm F4-5.6" },
580
        { 0x031f, "smc PENTAX-F 70-210mm F4-5.6" },
693
        { 0x031f, "smc PENTAX-F 70-210mm F4-5.6 or Tokina or Takumar Lens" }, //0
694
        { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },                        //1
695
        { 0x031f, "Tokina AF 730 75-300mm F4.5-5.6" },                        //2
581 696
        { 0x0320, "smc PENTAX-F 50mm F1.4" },
582 697
        { 0x0321, "smc PENTAX-F 50mm F1.7" },
583 698
        { 0x0322, "smc PENTAX-F 135mm F2.8 [IF]" },
......
587 702
        { 0x0327, "smc PENTAX-F* 600mm F4 ED[IF]" },
588 703
        { 0x0328, "smc PENTAX-F MACRO 100mm F2.8" },
589 704
        { 0x0329, "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO" },
590
        { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" },
591
        { 0x032e, "SIGMA APO 70-200mm F2.8 EX" },
705
        { 0x032c, "Tamron 35-90mm F4 AF or various SIGMA models" }, // 0
706
        { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 1
707
        { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 2
708
        { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 3
709
        { 0x032c, "Sigma 12-24mm F4.5 EX DG" }, // 4
710
        { 0x032e, "SIGMA APO 70-200mm F2.8 EX" }, // 0
711
        { 0x032e, "Sigma EX APO 100-300mm F4 IF" }, // 1
592 712
        { 0x0332, "smc PENTAX-FA 28-70mm F4 AL" },
593 713
        { 0x0333, "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO" },
594
        { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" },
714
        { 0x0334, "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]" }, // 0
715
        { 0x0334, "Tamron AF LD 28-200mm F3.8-5.6 [IF] Aspherical (171D)" }, // 1
595 716
        { 0x0335, "smc PENTAX-FA 28-80mm F3.5-5.6 AL" },
596 717
        { 0x03f7, "smc PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED[IF]" },
597 718
        { 0x03f8, "smc PENTAX-DA 12-24mm F4 ED AL[IF]" },
......
600 721
        { 0x03fc, "smc PENTAX-DA 18-55mm F3.5-5.6 AL" },
601 722
        { 0x03fd, "smc PENTAX-DA 14mm F2.8 ED[IF]" },
602 723
        { 0x03fe, "smc PENTAX-DA 16-45mm F4 ED AL" },
603
        { 0x03ff, "SIGMA" },
724
        { 0x03ff, "SIGMA" }, // 0
725
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 1
726
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 2
727
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 3
728
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 4
729
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 5
730
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 6
731
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 7
732
        { 0x03ff, "Sigma 18-200mm F3.5-6.3 DC" }, // 8
733
        { 0x03ff, "Sigma 18-50mm F2.8 EX DC" }, // 9
604 734
        { 0x0401, "smc PENTAX-FA SOFT 28mm F2.8" },
605 735
        { 0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6" },
606 736
        { 0x0403, "smc PENTAX-FA 43mm F1.9 Limited" },
......
610 740
        { 0x0410, "TAMRON AF 80-210mm F4-5.6 (178D)" },
611 741
        { 0x0413, "TAMRON SP AF 90mm F2.8 (172E)" },
612 742
        { 0x0414, "smc PENTAX-FA 28-80mm F3.5-5.6" },
743
        { 0x0415, "Cosina AF 100-300mm F5.6-6.7" },
613 744
        { 0x0416, "TOKINA 28-80mm F3.5-5.6" },
614 745
        { 0x0417, "smc PENTAX-FA 20-35mm F4 AL" },
615 746
        { 0x0418, "smc PENTAX-FA 77mm F1.8 Limited" },
616 747
        { 0x0419, "TAMRON SP AF 14mm F2.8" },
617
        { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5" },
748
        { 0x041a, "smc PENTAX-FA MACRO 100mm F3.5 or Cosina lens" }, //0
749
        { 0x041a, "Cosina 100mm F3.5 Macro" }, //1
618 750
        { 0x041b, "TAMRON AF28-300mm F/3.5-6.3 LD Aspherical[IF] MACRO (285D)" },
619 751
        { 0x041c, "smc PENTAX-FA 35mm F2 AL" },
620 752
        { 0x041d, "TAMRON AF 28-200mm F/3.8-5.6 LD Super II MACRO (371D)" },
......
627 759
        { 0x0429, "TAMRON AF 28-200mm Super Zoom F3.8-5.6 Aspherical XR [IF] MACRO (A03)" },
628 760
        { 0x042b, "smc PENTAX-FA 28-90mm F3.5-5.6" },
629 761
        { 0x042c, "smc PENTAX-FA J 75-300mm F4.5-5.8 AL" },
630
        { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR" },
762
        { 0x042d, "TAMRON 28-300mm F3.5-6.3 Ultra zoom XR or Tamron AF 28-300mm F3.5-6.3 XR Di LD Aspherical [IF] Macro" }, //0
631 763
        { 0x042e, "smc PENTAX-FA J 28-80mm F3.5-5.6 AL" },
632 764
        { 0x042f, "smc PENTAX-FA J 18-35mm F4-5.6 AL" },
633 765
        { 0x0431, "TAMRON SP AF 28-75mm F2.8 XR Di (A09)" },
634 766
        { 0x0433, "smc PENTAX-D FA 50mm F2.8 MACRO" },
635 767
        { 0x0434, "smc PENTAX-D FA 100mm F2.8 MACRO" },
768
        { 0x044b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
769
        { 0x04e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
770
        { 0x04e6, "Tamron SP AF 17-50mm F2.8 XR Di II" },
771
        { 0x04e7, "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]" },
772
        { 0x04ed, "Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5" },
773
        { 0x04ef, "Samsung D-XENON 12-24mm F4 ED AL [IF]" },
774
        { 0x04f3, "smc PENTAX-DA 70mm F2.4 Limited" },
636 775
        { 0x04f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
637 776
        { 0x04f5, "Schneider D-XENON 50-200mm" },
638 777
        { 0x04f6, "Schneider D-XENON 18-55mm" },
......
660 799
        { 0x050e, "smc PENTAX-FA* 250-600mm F5.6 ED[IF]" },
661 800
        { 0x050f, "smc PENTAX-FA 28-105mm F4-5.6" },
662 801
        { 0x0510, "smc PENTAX-FA 100-300mm F4.5-5.6" },
802
        { 0x0562, "smc PENTAX-FA 100-300mm F4.5-5.6" },
663 803
        { 0x0601, "smc PENTAX-FA* 85mm F1.4[IF]" },
664 804
        { 0x0602, "smc PENTAX-FA* 200mm F2.8 ED[IF]" },
665 805
        { 0x0603, "smc PENTAX-FA* 300mm F2.8 ED[IF]" },
......
673 813
        { 0x060d, "smc PENTAX-FA* 400mm F5.6 ED[IF]" },
674 814
        { 0x060e, "smc PENTAX-FA* MACRO 200mm F4 ED[IF]" },
675 815
        { 0x0700, "smc PENTAX-DA 21mm F3.2 AL Limited" },
816
        { 0x073a, "smc PENTAX-D FA Macro 100mm F2.8 WR" },
676 817
        { 0x074b, "Tamron SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)" },
818
        { 0x07d4, "smc Pentax-DA 50mm F1.8" },
819
        { 0x07d5, "smc PENTAX-DA 40mm F2.8 XS" },
677 820
        { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
678
        { 0x07d6, "smc PENTAX-DA 35mm F2.4 AL" },
821
        { 0x07d8, "smc PENTAX-DA L 55-300mm F4-5.8 ED" },
679 822
        { 0x07d9, "smc PENTAX-DA 50-200mm F4-5.6 ED WR" },
680 823
        { 0x07da, "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR" },
681 824
        { 0x07dc, "Tamron SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]" },
825
        { 0x07dd, "smc PENTAX-DA L 50-200mm F4-5.6 ED" },
682 826
        { 0x07de, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
683 827
        { 0x07df, "Samsung D-XENON 18-55mm F3.5-5.6 II" },
684 828
        { 0x07e0, "smc PENTAX-DA 15mm F4 ED AL Limited" },
685 829
        { 0x07e1, "Samsung D-XENON 18-250mm F3.5-6.3" },
830
        { 0x07e2, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
831
        { 0x07e3, "smc PENTAX-DA* 55mm F1.4 SDM (SDM unused)" },
686 832
        { 0x07e5, "smc PENTAX-DA 18-55mm F3.5-5.6 AL II" },
687 833
        { 0x07e6, "Tamron AF 17-50mm F2.8 XR Di-II LD (Model A16)" },
688 834
        { 0x07e7, "smc PENTAX-DA 18-250mm F3.5-6.3ED AL [IF]" },
......
695 841
        { 0x07f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM not used)" },
696 842
        { 0x07f3, "smc PENTAX-DA 70mm F2.4 Limited" },
697 843
        { 0x07f4, "smc PENTAX-DA 21mm F3.2 AL Limited" },
844
        { 0x0804, "Sigma 50mm F1.4 EX DG HSM" },
698 845
        { 0x0808, "SIGMA 18-250mm F3.5-6.3 DC OS HSM" },
846
        { 0x080b, "Sigma 10-20mm F3.5 EX DC HSM" },
847
        { 0x080c, "Sigma 70-300mm F4-5.6 DG OS" },
848
        { 0x080d, "Sigma 120-400mm F4.5-5.6 APO DG OS HSM" },
849
        { 0x080e, "Sigma 17-70mm F2.8-4.0 DC Macro OS HSM" },
850
        { 0x080f, "Sigma 150-500mm F5-6.3 APO DG OS HSM" },
851
        { 0x0810, "Sigma 70-200mm F2.8 EX DG Macro HSM II" },
852
        { 0x0811, "Sigma 50-500mm F4.5-6.3 DG OS HSM" },
853
        { 0x0812, "Sigma 8-16mm F4.5-5.6 DC HSM" },
854
        { 0x0815, "Sigma 17-50mm F2.8 EX DC OS HSM" },
855
        { 0x0816, "Sigma 85mm F1.4 EX DG HSM" },
856
        { 0x0817, "Sigma 70-200mm F2.8 APO EX DG OS HSM" },
857
        { 0x081b, "Sigma 18-200mm F3.5-6.3 II DC HSM" },
858
        { 0x08d2, "smc Pentax-DA 18-270mm F3.5-6.3 ED SDM" },
699 859
        { 0x08d7, "smc PENTAX-DA 18-135mm F3.5-5.6 ED AL [IF] DC WR" },
700 860
        { 0x08e2, "smc PENTAX-DA* 55mm F1.4 SDM" },
701 861
        { 0x08e3, "smc PENTAX DA* 60-250mm F4 [IF] SDM"},
......
704 864
        { 0x08eb, "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM" },
705 865
        { 0x08f1, "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM" },
706 866
        { 0x08f2, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM" },
867
        { 0x08ff, "Sigma lens" }, //0
868
        { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //1
869
        { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //2
870
        { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //3
871
        { 0x08ff, "Sigma 70-200mm F2.8 EX DG Macro HSM II" }, //4
872
        { 0x0900, "645 Manual lens" }, //1
873
        { 0x0a00, "645 A Series lens" }, //1
707 874
        { 0x0b04, "smc PENTAX-FA645 Zoom 45mm-85mm F4.5" },
708 875
        { 0x0b07, "smc PENTAX-FA645 Macro 120mm F4" },
876
        { 0x0b08, "smc PENTAX-FA 645 80-160mm F4.5" },
877
        { 0x0b0b, "smc PENTAX-FA 645 35mm F3.5 AL [IF]" },
878
        { 0x0b10, "smc PENTAX-FA 645 33-55mm F4.5 AL" },
709 879
        { 0x0b11, "smc PENTAX-FA645 Zoom 150mm-300mm F5.6 ED [IF]" },
880
        { 0x0d12, "smc PENTAX-D FA 645 55mm F2.8 AL [IF] SDM AW" },
881
        { 0x0d13, "smc PENTAX-D FA 645 25mm F4 AL [IF] SDM AW" },
882
        { 0x1500, "Pentax Q Manual Lens" },
883
        { 0x1501, "01 Standard Prime 8.5mm F1.9" },
884
        { 0x1502, "02 Standard Zoom 5-15mm F2.8-4.5" },
885
        { 0x1503, "03 Fish-eye 3.2mm F5.6" },
886
        { 0x1504, "04 Toy Lens Wide 6.3mm F7.1" },
887
        { 0x1505, "05 Toy Lens Telephoto 18mm F8" },
888
        { 0x1506, "06 Telephoto Zoom 15-45mm F2.8" },
710 889
    };
711 890

  
712 891
    //! ImageTone, tag 0x004f
......
717 896
        {    3, N_("Landscape") },
718 897
        {    4, N_("Vibrant") },
719 898
        {    5, N_("Monochrome") },
899
        {    6, N_("Muted") },
720 900
        {    7, N_("Reversal film") },
901
        {    8, N_("Bleach bypass") },
902
        {    9, N_("Radiant") },
721 903
    };
722 904

  
723 905
    //! DynamicRangeExpansion, tag 0x0069
    (1-1/1)