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

Cleanup, fix compilation warning conditions.

merge-requests/1/head
Gerhard Jaeger 2013-02-13 10:31:22 +01:00
rodzic b99a14542a
commit b91010f240
2 zmienionych plików z 5 dodań i 54 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

52
backend/plustek-usbscan.c
Wyświetl plik

@ -7,7 +7,7 @@
* @brief Scanning...
*
* Based on sources acquired from Plustek Inc.<br>
* Copyright (C) 2001-2007 Gerhard Jaeger <gerhard@gjaeger.de>
* Copyright (C) 2001-2013 Gerhard Jaeger <gerhard@gjaeger.de>
*
* History:
* - 0.40 - starting version of the USB support
@ -29,7 +29,7 @@
* - changed usb_MapDownload prototype
* - 0.50 - cleanup
* - 0.51 - added usb_get_res() and usb_GetPhyPixels()
* - 0.52 - no changes
* - 0.52 - removed stuff, that will most probably nver be used
* .
* <hr>
* This file is part of the SANE package.
@ -1495,7 +1495,6 @@ usb_IsDataAvailableInDRAM( Plustek_Device *dev )
static SANE_Bool
usb_ScanReadImage( Plustek_Device *dev, void *pBuf, u_long dwSize )
{
static u_long dwBytes = 0;
u_char *regs = dev->usbDev.a_bRegs;
SANE_Status res;
@ -1503,7 +1502,6 @@ usb_ScanReadImage( Plustek_Device *dev, void *pBuf, u_long dwSize )
if( m_fFirst ) {
dwBytes = 0;
m_fFirst = SANE_FALSE;
/* Wait for data band ready */
@ -1515,52 +1513,6 @@ usb_ScanReadImage( Plustek_Device *dev, void *pBuf, u_long dwSize )
/* restore the fast forward stepsize...*/
sanei_lm983x_write(dev->fd, 0x48, &regs[0x48], 2, SANE_TRUE);
}
/* HEINER: ADF */
#if 0
if(ScanInf.m_fADF == 1 && Scanning.sParam.bCalibration == PARAM_Scan)
{
if(dwBytes)
{
DWORD dw;
BOOL fRet;
if(dwSize < dwBytes)
dw = dwSize;
else
dw = dwBytes;
fRet = ReadData(0x00, (PBYTE)pBuf, dw);
dwBytes -= dw;
if(!dwBytes)
{
WriteRegister(0x07, 0); /* To stop scanning */
ScanInf.m_fADF++;
if(dwSize > dw)
ScanReadImage((PBYTE)pBuf + dw, dwSize - dw);
}
return fRet;
}
else if(!Hardware.SensorPaper())
{
dwBytes = (Scanning.sParam.PhyDpi.y * 18 / 25) * Scanning.sParam.Size.dwPhyBytes;
return ScanReadImage(pBuf, dwSize);
}
}
else if(ScanInf.m_fADF > 1)
{
DWORD dw;
if(Scanning.sParam.bBitDepth > 8)
{
for(dw = 0; dw < dwSize; dw += 2)
*((PWORD)pBuf + dw) = 0xfffc;
}
else
FillMemory(pBuf, dwSize, 0xff);
return TRUE;
}
#endif
res = sanei_lm983x_read(dev->fd, 0x00, (u_char *)pBuf, dwSize, SANE_FALSE);
/* check for pressed ESC button, as sanei_lm983x_read() may take some time

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

@ -7,7 +7,7 @@
* @brief Calibration routines.
*
* Based on sources acquired from Plustek Inc.<br>
* Copyright (C) 2001-2007 Gerhard Jaeger <gerhard@gjaeger.de>
* Copyright (C) 2001-2013 Gerhard Jaeger <gerhard@gjaeger.de>
*
* History:
* - 0.40 - starting version of the USB support
@ -33,6 +33,7 @@
* - 0.51 - added fine calibration cache
* - 0.52 - added get_ptrs to let various sensororders work
* correctly
* - fixed warning condition
* .
* <hr>
* This file is part of the SANE package.
@ -1859,7 +1860,6 @@ static SANE_Bool usb_AdjustWhiteShading( Plustek_Device *dev )
u_long dw, dwLines, dwRead;
u_long shading_lines;
MonoWordDef *pValue;
RGBUShortDef *m_pAvColor;
u_short *m_pAvMono;
u_long *pdw, *m_pSum;
u_short hilight, shadow;
@ -1872,8 +1872,7 @@ static SANE_Bool usb_AdjustWhiteShading( Plustek_Device *dev )
DBG( _DBG_INFO, "#########################\n" );
DBG( _DBG_INFO, "usb_AdjustWhiteShading()\n" );
m_pAvColor = (RGBUShortDef*)scan->pScanBuffer;
m_pAvMono = (u_short*)scan->pScanBuffer;
m_pAvMono = (u_short*)scan->pScanBuffer;
if( usb_IsEscPressed())
return SANE_FALSE;