mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

fixed bug, that causes CanoScan devices to use the wrong calibration functions, 

sanei_usb_get_vendor_product() fails.
merge-requests/1/head
Gerhard Jaeger 2003-10-23 07:26:32 +00:00
rodzic 4262ffb4cd
commit 5499cf930d
2 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/plustek-usb.c
Wyświetl plik

@ -575,7 +575,7 @@ static int usbDev_open( const char *dev_name, void *misc )
} else {
DBG( _DBG_INFO, "Can't get vendor ID from driver...\n" );
DBG( _DBG_INFO, "Can't get vendor & product ID from driver...\n" );
/* if the ioctl stuff is not supported by the kernel and we have
* nothing specified, we have to give up...
@ -587,8 +587,10 @@ static int usbDev_open( const char *dev_name, void *misc )
return -1;
}
vendor = strtol( dev->usbId, 0, 0 );
DBG( _DBG_INFO, "... using the specified: 0x%04x\n", vendor );
vendor = strtol( &dev->usbId[0], 0, 0 );
product = strtol( &dev->usbId[7], 0, 0 );
DBG( _DBG_INFO, "... using the specified: "
"0x%04x-0x%04x\n", vendor, product );
}
/*
@ -619,6 +621,9 @@ static int usbDev_open( const char *dev_name, void *misc )
dev->usbDev.vendor = vendor;
dev->usbDev.product = product;
DBG( _DBG_INFO, "Detected vendor & product ID: "
"0x%04x-0x%04x\n", vendor, product );
/*
* Plustek uses the misc IO 1/2 to get the PCB ID
* (PCB = printed circuit board), so it's possible to have one

2
backend/plustek.c
Wyświetl plik

@ -139,7 +139,7 @@
#include "../include/sane/sanei.h"
#include "../include/sane/saneopts.h"
#define BACKEND_VERSION "0.46-6"
#define BACKEND_VERSION "0.46-7"
#define BACKEND_NAME plustek
#include "../include/sane/sanei_backend.h"
#include "../include/sane/sanei_config.h"