summaryrefslogtreecommitdiff
path: root/backend/plustek-pp_p12.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/plustek-pp_p12.c
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/plustek-pp_p12.c')
-rw-r--r--backend/plustek-pp_p12.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/plustek-pp_p12.c b/backend/plustek-pp_p12.c
index 6f46e58..2dc4e45 100644
--- a/backend/plustek-pp_p12.c
+++ b/backend/plustek-pp_p12.c
@@ -121,7 +121,7 @@ static void p12InitiateComponentModel( pScanData ps )
case _SCANNER5Button:
DBG( DBG_LOW, "Scanner has 5 Buttons\n" );
- ps->Device.dwModelOriginY = 64 + 20;
+ ps->Device.dwModelOriginY = 64 + 20;
p12ButtonSetup( ps, 5 );
break;
@@ -153,7 +153,7 @@ static void p12InitiateComponentModel( pScanData ps )
case _SCANNER2Button:
DBG( DBG_LOW, "Scanner has 2 Buttons\n" );
DBG( DBG_LOW, "Seems we have a Genius Colorpage Vivid III V2\n" );
- ps->Device.dwModelOriginY = 64 - 33;
+ ps->Device.dwModelOriginY = 64 - 33;
p12ButtonSetup( ps, 2 );
ps->sCaps.Model = MODEL_GEN_CPV2;
break;
@@ -232,7 +232,7 @@ static void p12SetupScanningCondition( pScanData ps )
ps->Scan.dwMaxReadFifo += (ps->DataInf.dwAsicBytesPerPlane / 2);
- DBG( DBG_LOW, "MinReadFifo=%u, MaxReadFifo=%u\n",
+ DBG( DBG_LOW, "MinReadFifo=%u, MaxReadFifo=%u\n",
ps->Scan.dwMinReadFifo, ps->Scan.dwMaxReadFifo );
/* ------- Set the max. read fifo to asic ------- */
@@ -260,7 +260,7 @@ static void p12SetupScanningCondition( pScanData ps )
channel = _GREEN_FULLSIZE << 16;
ps->AsicReg.RD_BufFullSize = _SIZE_GREENFIFO;
}
-
+
lGreen = (ULong)(-lGreen * ps->DataInf.dwAsicBytesPerPlane);
if( ps->DataInf.wPhyDataType > COLOR_TRUE24 )
@@ -434,7 +434,7 @@ static void p12ProgramCCD( pScanData ps)
DBG( DBG_IO, " %u regs * %u (intermediate)\n",
ps->Device.wNumCCDRegs, ps->Shade.bIntermediate );
- rp = ps->Device.pCCDRegisters +
+ rp = ps->Device.pCCDRegisters +
(ULong)ps->Device.wNumCCDRegs * ps->Shade.bIntermediate;
for( w = ps->Device.wNumCCDRegs; w--; rp++ ) {