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

Fixed po problem (tmp solution), fixed bug in shading function and fixed 

some typos...
DEVEL_2_0_BRANCH-1
Gerhard Jaeger 2002-10-17 08:21:10 +00:00
rodzic 9a266515f9
commit 7f023e1fc5
5 zmienionych plików z 22 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
ChangeLog
Wyświetl plik

@ -1,3 +1,11 @@
2002-10-17 Gerhard Jaeger <gerhard@gjaeger.de>
* backend/plustek.c: removed internationalization stuff
* backend/plustek-usb.c: removed obsolete definitions
* backend/plustek-usbhw.c: fixed typos
* backend/plustek-usnshading.c: fixed bug that produces
files > 700M in debug mode. Added some debug output.
2002-10-16 Oliver Rauch <Oliver.Rauch@rauch-domain.de>
* backend/umax.c, umax-scanner.c: added Power Look 2000

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

@ -582,11 +582,9 @@ static int usbDev_setMap( Plustek_Device *dev, SANE_Word *map,
if( channel == _MAP_MASTER ) {
for( i = 0; i < length; i++ ) {
#ifndef _GENE_
a_bMap[i] = (SANE_Byte)map[i];
a_bMap[length +i] = (SANE_Byte)map[i];
a_bMap[(length*2)+i] = (SANE_Byte)map[i];
#endif
}
} else {
@ -597,11 +595,9 @@ static int usbDev_setMap( Plustek_Device *dev, SANE_Word *map,
if( channel == _MAP_BLUE )
idx = 2;
#ifndef _GENE_
for( i = 0; i < length; i++ ) {
a_bMap[(length * idx)+i] = (SANE_Byte)map[i];
}
#endif
}
return 0;

2
backend/plustek-usbhw.c
Wyświetl plik

@ -1029,7 +1029,7 @@ static void usb_ResetRegisters( pPlustek_Device dev )
} else {
memcpy( a_bRegs+0x54, &hw->bReg_0x54, 0x5e - 0x54 + 1 );
}
DBG( _DBG_INFO, "MISC I/O after RESET: 0%02x, 0%02x, 0%02x\n",
DBG( _DBG_INFO, "MISC I/O after RESET: 0x%02x, 0x%02x, 0x%02x\n",
a_bRegs[0x59], a_bRegs[0x5a], a_bRegs[0x5b] );
}

15
backend/plustek-usbshading.c
Wyświetl plik

@ -738,7 +738,7 @@ TOGAIN:
return SANE_TRUE;
}
/** usb_GetNewOffset
/** usb_GetNewOffset
*
*/
static void usb_GetNewOffset( u_long *pdwSum, u_long *pdwDiff,
@ -1194,8 +1194,7 @@ static SANE_Bool usb_AdjustWhiteShading( pPlustek_Device dev )
usleep(10 * 1000);
}
dumpPic( tmp, pBuf + dwRead, m_ScanParam.Size.dwBytes *
m_ScanParam.Size.dwTotalBytes );
dumpPic( tmp, pBuf + dwRead, m_ScanParam.Size.dwTotalBytes );
if( usb_ScanEnd( dev )) {
dwRead += m_ScanParam.Size.dwTotalBytes;
@ -1595,6 +1594,12 @@ static int usb_DoCalibration( pPlustek_Device dev )
Gain_Reg.Green = a_bRegs[0x3c];
Gain_Reg.Blue = a_bRegs[0x3d];
Gain_NegHilight = Gain_Hilight;
DBG( _DBG_INFO, "MCLK = %.3f\n", dMCLK );
DBG( _DBG_INFO, "GainRed = %u\n", a_bRegs[0x3b] );
DBG( _DBG_INFO, "GainGreen = %u\n", a_bRegs[0x3c] );
DBG( _DBG_INFO, "GainBlue = %u\n", a_bRegs[0x3d] );
#if 0
if( !usb_ModuleMove( dev, MOVE_Backward,
dev->usbDev.pSource->DataOrigin.y +
@ -1610,8 +1615,8 @@ static int usb_DoCalibration( pPlustek_Device dev )
if(!usb_AdjustGain( dev, 1 ))
return _E_INTERNAL;
/* a_bRegs[0x3b] = a_bRegs[0x3c] = a_bRegs[0x3d] = 1;
*/
a_bRegs[0x3b] = a_bRegs[0x3c] = a_bRegs[0x3d] = 1;
DBG( _DBG_INFO, "Settings done, so start...\n" );
if( !usb_AdjustOffset(dev) || !usb_AdjustDarkShading(dev) ||
!usb_AdjustWhiteShading(dev)) {

5
backend/plustek.c
Wyświetl plik

@ -120,7 +120,7 @@
#include "sane/sanei.h"
#include "sane/saneopts.h"
#define BACKEND_VERSION "0.44-9"
#define BACKEND_VERSION "0.44-10"
#define BACKEND_NAME plustek
#include "sane/sanei_backend.h"
#include "sane/sanei_config.h"
@ -238,7 +238,8 @@ static const SANE_String_Const ext_mode_list[] =
{
SANE_I18N("Normal"),
SANE_I18N("Transparency"),
SANE_I18N("Negative"),
/* SANE_I18N("Negative"),TEMP. DISABLED ! */
"Negative",
NULL
};