Merge branch 'feature/upstream' into develop

1 files changed, 20 insertions, 20 deletions

diff --git a/backend/mustek_usb2_reflective.c b/backend/mustek_usb2_reflective.c
index baf80e4..ed37296 100644
--- a/backend/mustek_usb2_reflective.c
+++ b/backend/mustek_usb2_reflective.c
@@ -82,31 +82,31 @@ Reflective_Reset ()
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
+  if (SANE_STATUS_GOOD != Asic_Open (&g_chip, g_pDeviceFile))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_Open return error\n");
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_Reset (&g_chip))
+  if (SANE_STATUS_GOOD != Asic_Reset (&g_chip))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_Reset return error\n");
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_SetSource (&g_chip, LS_REFLECTIVE))
+  if (SANE_STATUS_GOOD != Asic_SetSource (&g_chip, LS_REFLECTIVE))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_SetSource return error\n");
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_TurnLamp (&g_chip, TRUE))
+  if (SANE_STATUS_GOOD != Asic_TurnLamp (&g_chip, TRUE))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_TurnLamp return error\n");
       return FALSE;
     }
 
-  if (STATUS_GOOD != Asic_Close (&g_chip))
+  if (SANE_STATUS_GOOD != Asic_Close (&g_chip))
     {
       DBG (DBG_FUNC, "Reflective_Reset: Asic_Close return error\n");
       return FALSE;
@@ -362,7 +362,7 @@ Reflective_SetupScan (COLORMODE ColorMode,
 		      unsigned short YDpi,
 		      SANE_Bool isInvert, unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height)
 {
-  isInvert = isInvert;
+  (void) isInvert;
   DBG (DBG_FUNC, "Reflective_SetupScan: Call in\n");
   if (g_bOpened)
     {
@@ -439,7 +439,7 @@ Reflective_SetupScan (COLORMODE ColorMode,
       break;
     }
 
-  if (Asic_Open (&g_chip, g_pDeviceFile) != STATUS_GOOD)
+  if (Asic_Open (&g_chip, g_pDeviceFile) != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC, "Reflective_SetupScan: Asic_Open return error\n");
       return FALSE;
@@ -1153,7 +1153,7 @@ Reflective_FindTopLeft (unsigned short * lpwStartX, unsigned short * lpwStartY)
   Asic_SetCalibrate (&g_chip, 8, wXResolution, wYResolution, 0, 0, wCalWidth,
 		     wCalHeight, FALSE);
   Asic_SetAFEGainOffset (&g_chip);
-  if (Asic_ScanStart (&g_chip) != STATUS_GOOD)
+  if (Asic_ScanStart (&g_chip) != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC, "Reflective_FindTopLeft: Asic_ScanStart return error\n");
       free (lpCalData);
@@ -1162,7 +1162,7 @@ Reflective_FindTopLeft (unsigned short * lpwStartX, unsigned short * lpwStartY)
 
   for (i = 0; i < nScanBlock; i++)
     {
-      if (STATUS_GOOD !=
+      if (SANE_STATUS_GOOD !=
 	  Asic_ReadCalibrationData (&g_chip,
 				    lpCalData + i * g_dwCalibrationSize,
 				    g_dwCalibrationSize, 8))
@@ -1174,7 +1174,7 @@ Reflective_FindTopLeft (unsigned short * lpwStartX, unsigned short * lpwStartY)
 	}
     }
 
-  if (STATUS_GOOD !=
+  if (SANE_STATUS_GOOD !=
       Asic_ReadCalibrationData (&g_chip,
 				lpCalData +
 				(nScanBlock) * g_dwCalibrationSize,
@@ -1340,7 +1340,7 @@ Return value:
 static SANE_Bool
 Reflective_LineCalibration16Bits ()
 {
-  STATUS status;
+  SANE_Status status;
   SANE_Byte * lpWhiteData;
   SANE_Byte * lpDarkData;
   unsigned int dwWhiteTotalSize;
@@ -1403,7 +1403,7 @@ Reflective_LineCalibration16Bits ()
   status =
     Asic_SetCalibrate (&g_chip, 48, g_XDpi, g_YDpi, g_X, 0, wCalWidth,
 		       wCalHeight, TRUE);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_SetCalibrate return error \n");
@@ -1415,7 +1415,7 @@ Reflective_LineCalibration16Bits ()
     }
 
   status = Asic_ScanStart (&g_chip);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_ScanStart return error \n");
@@ -1427,7 +1427,7 @@ Reflective_LineCalibration16Bits ()
 
   status =
     Asic_ReadCalibrationData (&g_chip, lpWhiteData, dwWhiteTotalSize, 8);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       free (lpWhiteData);
       free (lpDarkData);
@@ -1438,7 +1438,7 @@ Reflective_LineCalibration16Bits ()
 
   /*Read dark level data */
   status = Asic_SetMotorType (&g_chip, FALSE, TRUE);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_SetMotorType return error \n");
@@ -1451,7 +1451,7 @@ Reflective_LineCalibration16Bits ()
   status =
     Asic_SetCalibrate (&g_chip, 48, g_XDpi, g_YDpi, g_X, 0, wCalWidth,
 		       wCalHeight, TRUE);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_SetCalibrate return error \n");
@@ -1462,7 +1462,7 @@ Reflective_LineCalibration16Bits ()
     }
 
   status = Asic_TurnLamp (&g_chip, FALSE);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_TurnLamp return error \n");
@@ -1475,7 +1475,7 @@ Reflective_LineCalibration16Bits ()
   usleep (500000);
 
   status = Asic_ScanStart (&g_chip);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_ScanStart return error \n");
@@ -1486,7 +1486,7 @@ Reflective_LineCalibration16Bits ()
     }
 
   status = Asic_ReadCalibrationData (&g_chip, lpDarkData, dwDarkTotalSize, 8);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_ReadCalibrationData return error \n");
@@ -1500,7 +1500,7 @@ Reflective_LineCalibration16Bits ()
 
   /* Turn on lamp */
   status = Asic_TurnLamp (&g_chip, TRUE);
-  if (status != STATUS_GOOD)
+  if (status != SANE_STATUS_GOOD)
     {
       DBG (DBG_FUNC,
 	   "Reflective_LineCalibration16Bits: Asic_TurnLamp return error \n");