darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2002-03-04 Lutz M�ller <lutz@users.sourceforge.net>

Browse Source 
With the help of Thomas Ronayne <trona@ameritech.net>:

	* 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.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4236 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2002-03-04 19:25:25 +00:00
parent d2343ffaad
commit d672c15974
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/konica/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-03-04 Lutz Müller <lutz@users.sourceforge.net>
With the help of Thomas Ronayne <trona@ameritech.net>:
* 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 <lutz@users.sourceforge.net>
* library.h: Removed.

4
camlibs/konica/konica.c
View File

@@ -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];

2
camlibs/konica/library.c
View File

@@ -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}
};