diff --git a/camlibs/konica/ChangeLog b/camlibs/konica/ChangeLog index 1d81681c4..e72d2320d 100644 --- a/camlibs/konica/ChangeLog +++ b/camlibs/konica/ChangeLog @@ -1,3 +1,11 @@ +2002-03-04 Lutz Müller + + With the help of Thomas Ronayne : + + * konica.c (konica_get_image_info): The C200 needs up to 2 seconds + to respond. + * library.c: The image ids for a C200 are 2 bytes long, not 4. + 2002-01-29 Lutz Müller * library.h: Removed. diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c index 27b99da9b..96da40b3e 100644 --- a/camlibs/konica/konica.c +++ b/camlibs/konica/konica.c @@ -472,7 +472,7 @@ k_get_image_information ( if (!image_id_long) { sb[6] = image_number; sb[7] = image_number >> 8; - CRF (c, l_send_receive (p, c, sb, 8, &rb, &rbs, 1000, + CRF (c, l_send_receive (p, c, sb, 8, &rb, &rbs, 2000, ib, ibs), rb); *image_id = (unsigned long) ((rb[5] << 8) | rb[4]); *exif_size = (rb[7] << 8) | rb[6]; @@ -482,7 +482,7 @@ k_get_image_information ( sb[7] = image_number >> 24; sb[8] = image_number; sb[9] = image_number >> 8; - CRF (c, l_send_receive (p, c, sb, 10, &rb, &rbs, 1000, + CRF (c, l_send_receive (p, c, sb, 10, &rb, &rbs, 2000, ib, ibs), rb); *image_id = (rb[5] << 24) | (rb[4] << 16) | (rb[7] << 8 ) | rb[6]; diff --git a/camlibs/konica/library.c b/camlibs/konica/library.c index aad066f28..fe55212b7 100644 --- a/camlibs/konica/library.c +++ b/camlibs/konica/library.c @@ -66,7 +66,7 @@ static struct { {"Konica Q-M200", 1, 0, 0}, {"HP PhotoSmart C20", 0, 0, 0}, {"HP PhotoSmart C30", 0, 0, 0}, - {"HP PhotoSmart C200", 1, 0, 0}, + {"HP PhotoSmart C200", 0, 0, 0}, {NULL, 0, 0, 0} };