summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2017-03-27 22:07:28 +0200
committerMarcus Meissner <marcus@jet.franken.de>2017-03-27 22:07:28 +0200
commit674626c19b04739cb420fedf141c4091e7eff314 (patch)
treec32f83db0b50cb4de23f9f13b4412ba1d78b6f50
parent1a4dae22c6013041191e3b61fd8c9afc00f8962d (diff)
downloadlibgphoto2-674626c19b04739cb420fedf141c4091e7eff314.tar.gz
k10d has a 288 byte status block
-rw-r--r--camlibs/pentax/pslr_model.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/camlibs/pentax/pslr_model.c b/camlibs/pentax/pslr_model.c
index c96012978..1fb75d88e 100644
--- a/camlibs/pentax/pslr_model.c
+++ b/camlibs/pentax/pslr_model.c
@@ -686,7 +686,7 @@ void ipslr_status_parse_k200d(ipslr_handle_t *p, pslr_status *status) {
ipslr_model_info_t camera_models[] = {
{ 0x12aa2, "*ist DS", 1, 1, 0, 264, 3, {6, 4, 2}, 5, 4000, 200, 3200, 200, 3200, PSLR_JPEG_IMAGE_TONE_BRIGHT, 0, 11, ipslr_status_parse_istds },
{ 0x12cd2, "K20D", 0, 1, 0, 412, 4, {14, 10, 6, 2}, 7, 4000, 100, 3200, 100, 6400, PSLR_JPEG_IMAGE_TONE_MONOCHROME, 1, 11, ipslr_status_parse_k20d },
- { 0x12c1e, "K10D", 0, 1, 0, 392, 3, {10, 6, 2}, 7, 4000, 100, 1600, 100, 1600, PSLR_JPEG_IMAGE_TONE_BRIGHT, 0, 11, ipslr_status_parse_k10d },
+ { 0x12c1e, "K10D", 0, 1, 0, 288, 3, {10, 6, 2}, 7, 4000, 100, 1600, 100, 1600, PSLR_JPEG_IMAGE_TONE_BRIGHT, 0, 11, ipslr_status_parse_k10d },
{ 0x12c20, "GX10", 0, 1, 0, 392, 3, {10, 6, 2}, 7, 4000, 100, 1600, 100, 1600, PSLR_JPEG_IMAGE_TONE_BRIGHT, 0, 11, ipslr_status_parse_k10d },
{ 0x12cd4, "GX20", 0, 1, 0, 412, 4, {14, 10, 6, 2}, 7, 4000, 100, 3200, 100, 6400, PSLR_JPEG_IMAGE_TONE_MONOCHROME, 1, 11, ipslr_status_parse_k20d },
{ 0x12dfe, "K-x", 0, 1, 0, 436, 3, {12, 10, 6, 2}, 9, 6000, 200, 6400, 100, 12800, PSLR_JPEG_IMAGE_TONE_MONOCHROME, 1, 11, ipslr_status_parse_kx }, //muted: bug