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

plustek-pp: Fix [-Wmisleading-indentation] compiler warnings

merge-requests/1/head
Olaf Meeuwissen 2017-07-12 21:20:12 +09:00
rodzic 48cb209f2a
commit 3eb3d6b9bf
6 zmienionych plików z 13 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -2221,7 +2221,7 @@ static void dacP98003AdjustShadingWaveform( pScanData ps )
} else } else
pwsum->Red = 0; pwsum->Red = 0;
if((short)(pwsum->Green -= ps->Shade.DarkOffset.Colors.Green) > 0) { if((short)(pwsum->Green -= ps->Shade.DarkOffset.Colors.Green) > 0) {
pwsum->Green = pwsum->Green * pRGB->Green / 100U; pwsum->Green = pwsum->Green * pRGB->Green / 100U;
if( pwsum->Green > 0xfff ) if( pwsum->Green > 0xfff )
pwsum->Green = 0xfff; pwsum->Green = 0xfff;

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

@ -1216,7 +1216,7 @@ static Bool imageP98003DataIsReady( pScanData ps )
IORegisterToScanner( ps, ps->RegRefreshScanState ); IORegisterToScanner( ps, ps->RegRefreshScanState );
/* direct is done here without copying...*/ /* direct is done here without copying...*/
if( fnDataDirect != ps->Scan.DataProcess ) { if( fnDataDirect != ps->Scan.DataProcess ) {
(*ps->Scan.DataProcess)(ps, (pVoid)(ps->Scan.bp.pMonoBuf ), (*ps->Scan.DataProcess)(ps, (pVoid)(ps->Scan.bp.pMonoBuf ),
(pVoid)(ps->Scan.BufPut.red.bp), (pVoid)(ps->Scan.BufPut.red.bp),
ps->DataInf.dwAppPhyBytesPerLine); ps->DataInf.dwAppPhyBytesPerLine);

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

@ -1248,7 +1248,7 @@ static void motorP96WaitForPositionY( pScanData ps )
MiscStartTimer( &timer, _SECOND / 4); MiscStartTimer( &timer, _SECOND / 4);
while (!MiscCheckTimer( &timer )); while (!MiscCheckTimer( &timer ));
memset( ps->a_nbNewAdrPointer, 0, _SCANSTATE_BYTES ); memset( ps->a_nbNewAdrPointer, 0, _SCANSTATE_BYTES );
ps->Asic96Reg.RD_MotorControl = ps->IgnorePF|ps->MotorOn|_MotorDirForward; ps->Asic96Reg.RD_MotorControl = ps->IgnorePF|ps->MotorOn|_MotorDirForward;
ps->Scan.fMotorBackward = _FALSE; ps->Scan.fMotorBackward = _FALSE;
@ -2671,7 +2671,7 @@ static void motorP98003WaitForPositionY( pScanData ps )
while(( IOGetExtendedStatus( ps ) & _STILL_FREE_RUNNING) && while(( IOGetExtendedStatus( ps ) & _STILL_FREE_RUNNING) &&
!MiscCheckTimer(&timer)); !MiscCheckTimer(&timer));
IODataToRegister( ps, ps->RegModeControl, _ModeScan ); IODataToRegister( ps, ps->RegModeControl, _ModeScan );
} else { } else {
MotorP98003PositionYProc( ps, dwBeginY ); MotorP98003PositionYProc( ps, dwBeginY );
IORegisterToScanner( ps, ps->RegRefreshScanState ); IORegisterToScanner( ps, ps->RegRefreshScanState );

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

@ -1105,7 +1105,7 @@ _LOC void P12InitCCDandDAC( pScanData ps, Bool shading )
else else
ps->Shade.bUniGain = 7; ps->Shade.bUniGain = 7;
ps->Shade.wDarkLevels = 10; ps->Shade.wDarkLevels = 10;
if( ps->Shade.bIntermediate & _ScanMode_Mono ) { if( ps->Shade.bIntermediate & _ScanMode_Mono ) {
SamsungDAC8531[0].bParam = 0x57; SamsungDAC8531[0].bParam = 0x57;

12
backend/plustek-pp_ptdrv.c
Wyświetl plik

@ -1399,7 +1399,7 @@ static int ptdrvRead( pScanData ps, pUChar buffer, int count )
else else
ps->Scan.fRefreshState = _TRUE; ps->Scan.fRefreshState = _TRUE;
ptdrvLampWarmup( ps ); ptdrvLampWarmup( ps );
if( _FALSE == ps->fScanningStatus ) { if( _FALSE == ps->fScanningStatus ) {
retval = _E_ABORT; retval = _E_ABORT;
@ -1466,16 +1466,16 @@ static int ptdrvRead( pScanData ps, pUChar buffer, int count )
if( ps->Scan.dwLinesToRead > ps->DataInf.dwAppLinesPerArea ) if( ps->Scan.dwLinesToRead > ps->DataInf.dwAppLinesPerArea )
ps->Scan.dwLinesToRead = ps->DataInf.dwAppLinesPerArea; ps->Scan.dwLinesToRead = ps->DataInf.dwAppLinesPerArea;
ps->DataInf.dwAppLinesPerArea -= ps->Scan.dwLinesToRead; ps->DataInf.dwAppLinesPerArea -= ps->Scan.dwLinesToRead;
if (ps->DataInf.dwScanFlag & SCANDEF_BmpStyle) if (ps->DataInf.dwScanFlag & SCANDEF_BmpStyle)
buffer += ((ps->Scan.dwLinesToRead - 1) * buffer += ((ps->Scan.dwLinesToRead - 1) *
ps->DataInf.dwAppBytesPerLine); ps->DataInf.dwAppBytesPerLine);
if (ps->DataInf.dwVxdFlag & _VF_DATATOUSERBUFFER) if (ps->DataInf.dwVxdFlag & _VF_DATATOUSERBUFFER)
ps->DataInf.pCurrentBuffer = ps->Scan.bp.pMonoBuf; ps->DataInf.pCurrentBuffer = ps->Scan.bp.pMonoBuf;
while(ps->fScanningStatus && ps->Scan.dwLinesToRead) { while(ps->fScanningStatus && ps->Scan.dwLinesToRead) {
_ASSERT(ps->ReadOneImageLine); _ASSERT(ps->ReadOneImageLine);
if (!ps->ReadOneImageLine(ps)) { if (!ps->ReadOneImageLine(ps)) {
@ -1549,8 +1549,8 @@ static int ptdrvRead( pScanData ps, pUChar buffer, int count )
ReadFinished: ReadFinished:
if( _ASIC_IS_98003 == ps->sCaps.AsicID ) if( _ASIC_IS_98003 == ps->sCaps.AsicID )
ps->CloseScanPath( ps ); ps->CloseScanPath( ps );
if( NULL != ps->Scan.bp.pMonoBuf ) if( NULL != ps->Scan.bp.pMonoBuf )
_KFREE( ps->Scan.bp.pMonoBuf ); _KFREE( ps->Scan.bp.pMonoBuf );

4
backend/plustek_pp.c
Wyświetl plik

@ -1537,7 +1537,7 @@ SANE_Status sane_control_option( SANE_Handle handle, SANE_Int option,
if( NULL != info ) if( NULL != info )
*info |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS; *info |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS;
mp = getModeList( s ); mp = getModeList( s );
scanmode = mp[s->val[OPT_MODE].w].scanmode; scanmode = mp[s->val[OPT_MODE].w].scanmode;
s->opt[OPT_GAMMA_VECTOR].cap |= SANE_CAP_INACTIVE; s->opt[OPT_GAMMA_VECTOR].cap |= SANE_CAP_INACTIVE;
@ -1702,7 +1702,7 @@ SANE_Status sane_control_option( SANE_Handle handle, SANE_Int option,
checkGammaSettings(s); checkGammaSettings(s);
if( NULL != info ) if( NULL != info )
*info |= SANE_INFO_RELOAD_PARAMS; *info |= SANE_INFO_RELOAD_PARAMS;
break; break;
default: default:
return SANE_STATUS_INVAL; return SANE_STATUS_INVAL;