diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2020-01-06 18:03:08 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-01-06 18:03:08 +0100 |
| commit | 6bd4c6793ecf446bac30da9013ccb09459a08ff0 (patch) | |
| tree | 2355529fa2213b16b150dcd07df87db14f79a0fb | |
| parent | 253fd059e8c5268651971978f6078db06b48e03a (diff) | |
| download | libgphoto2-6bd4c6793ecf446bac30da9013ccb09459a08ff0.tar.gz | |
synced from pktrioggercord.
2 new lenses mostly
| -rw-r--r-- | camlibs/pentax/exiftool_pentax_lens.txt | 2 | ||||
| -rw-r--r-- | camlibs/pentax/pslr.h | 2 | ||||
| -rw-r--r-- | camlibs/pentax/pslr_model.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/camlibs/pentax/exiftool_pentax_lens.txt b/camlibs/pentax/exiftool_pentax_lens.txt index f9bbf1baf..9d8d6bef7 100644 --- a/camlibs/pentax/exiftool_pentax_lens.txt +++ b/camlibs/pentax/exiftool_pentax_lens.txt @@ -168,6 +168,7 @@ {8, 0, "Sigma 50-150mm F2.8 II APO EX DC HSM"}, {8, 3, "Sigma 18-125mm F3.8-5.6 DC HSM"}, {8, 4, "Sigma 50mm F1.4 EX DG HSM"}, +{8, 6, "Sigma 4.5mm F2.8 EX DC Fisheye"}, {8, 7, "Sigma 24-70mm F2.8 IF EX DG HSM"}, {8, 8, "Sigma 18-250mm F3.5-6.3 DC OS HSM"}, {8, 11, "Sigma 10-20mm F3.5 EX DC HSM"}, @@ -178,6 +179,7 @@ {8, 16, "Sigma 70-200mm F2.8 EX DG Macro HSM II"}, {8, 17, "Sigma 50-500mm F4.5-6.3 DG OS HSM"}, {8, 18, "Sigma 8-16mm F4.5-5.6 DC HSM"}, +{8, 20, "Sigma 18-50mm F2.8-4.5 DC HSM"}, {8, 21, "Sigma 17-50mm F2.8 EX DC OS HSM"}, {8, 22, "Sigma 85mm F1.4 EX DG HSM"}, {8, 23, "Sigma 70-200mm F2.8 APO EX DG OS HSM"}, diff --git a/camlibs/pentax/pslr.h b/camlibs/pentax/pslr.h index 8ab06dfe3..df9c196f8 100644 --- a/camlibs/pentax/pslr.h +++ b/camlibs/pentax/pslr.h @@ -72,7 +72,7 @@ user_file_format_t *get_file_format_t( user_file_format uff ); // OFF-AUTO: Off-Auto-Aperture typedef enum { - PSLR_EXPOSURE_MODE_P = 0 , + PSLR_EXPOSURE_MODE_P = 0, PSLR_EXPOSURE_MODE_GREEN = 1, // PSLR_EXPOSURE_MODE_HYP = 2, // PSLR_EXPOSURE_MODE_AUTO_PICT = 1, diff --git a/camlibs/pentax/pslr_model.c b/camlibs/pentax/pslr_model.c index 10476600d..5d3068df6 100644 --- a/camlibs/pentax/pslr_model.c +++ b/camlibs/pentax/pslr_model.c @@ -968,7 +968,7 @@ ipslr_model_info_t camera_models[] = { { 0x1309c, "K-3II", false, false, true, true, false, true, 452, 4, {24, 14, 6, 2}, 9, 8000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_BLEACH_BYPASS, true, 27, ipslr_status_parse_k3}, { 0x12fca, "K-500", false, true, true, false, false, false, 452, 3, {16, 12, 8, 5}, 9, 6000, 100, 51200, 100, 51200, PSLR_JPEG_IMAGE_TONE_CROSS_PROCESSING, true, 11, ipslr_status_parse_k500}, // only limited support from here - { 0x12994, "*ist D", true, true, true, false, false, false, 0, 3, {6, 4, 2}, 3, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_NONE , false, 11, NULL}, // buffersize: 264 + { 0x12994, "*ist D", true, true, true, false, false, false, 0, 3, {6, 4, 2}, 3, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_NONE, false, 11, NULL}, // buffersize: 264 { 0x12b60, "*ist DS2", true, true, true, false, false, false, 0, 3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL}, { 0x12b1a, "*ist DL", true, true, true, false, false, false, 0, 3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL}, { 0x12b80, "GX-1L", true, true, true, false, false, false, 0, 3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, false, 11, NULL}, |