Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

1 files changed, 6 insertions, 5 deletions

diff --git a/backend/plustek-pp_motor.c b/backend/plustek-pp_motor.c
index f377b7e..c48710e 100644
--- a/backend/plustek-pp_motor.c
+++ b/backend/plustek-pp_motor.c
@@ -738,7 +738,7 @@ static void motorP98PositionYProc( pScanData ps, ULong dwStates )
 }
 
 /*.............................................................................
- * checks if the sensor is in it´s home position and moves it back if necessary
+ * checks if the sensor is in it´s home position and moves it back if necessary
  */
 static int motorP98CheckSensorInHome( pScanData ps )
 {
@@ -1248,7 +1248,7 @@ static void motorP96WaitForPositionY( pScanData ps )
 	MiscStartTimer( &timer, _SECOND / 4);
     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->Scan.fMotorBackward = _FALSE;
@@ -1875,7 +1875,7 @@ static void motorP96SetupRunTable( pScanData ps )
 		    if ((siSum -= (Short)ps->DataInf.xyPhyDpi.y) <= 0) {
 				siSum += (Short)wP96BaseDpi;
 
-    			if((ps->sCaps.Model == MODEL_OP_12000P)|| 
+    			if((ps->sCaps.Model == MODEL_OP_12000P)||
                                            (ps->sCaps.Model == MODEL_OP_A3I)) {
 					*p.pb |= _COLORRUNTABLE_GREEN;
                 } else {
@@ -1912,6 +1912,7 @@ static void motorP96SetupRunTable( pScanData ps )
 			    case 3:
 					if (*(p.pb + 2))
 					    bColor = 1;
+                                        // fall through
 			    case 2:
 					if (*(p.pb + 1))
 			    		bColor++;
@@ -2083,7 +2084,7 @@ static void motorP96WaitBack( pScanData ps )
     } else {
 		dw = _P96_FORWARDMOVES;
 	}
-	
+
 	memset( a_bScanStateTable, 1, dw );
     memset(&a_bScanStateTable[dw], 0xff, 250 - dw );
 
@@ -2671,7 +2672,7 @@ static void motorP98003WaitForPositionY( pScanData ps )
 
 	    while(( IOGetExtendedStatus( ps ) & _STILL_FREE_RUNNING) &&
                                                       !MiscCheckTimer(&timer));
-        	IODataToRegister( ps, ps->RegModeControl, _ModeScan );
+	    IODataToRegister( ps, ps->RegModeControl, _ModeScan );
     } else {
     	MotorP98003PositionYProc( ps, dwBeginY );
         IORegisterToScanner( ps, ps->RegRefreshScanState );