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

Remove redundant code from mustek_usb2.c.

merge-requests/1/head
Jan Hauffa 2011-03-06 15:13:46 +01:00 zatwierdzone przez m. allan noah
rodzic 694a69dcab
commit 0f63d16121
1 zmienionych plików z 14 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
backend/mustek_usb2.c
Wyświetl plik

@ -140,22 +140,15 @@ static Scanner_Model mustek_A2nu2_model = {
}; };
static SANE_Bool SetParameters (LPSETPARAMETERS pSetParameters); static SANE_Byte * g_lpNegImageData = NULL;
static SANE_Bool GetParameters (LPGETPARAMETERS pGetParameters); static SANE_Bool g_bIsFirstGetNegData = TRUE;
static SANE_Bool StartScan (void); static SANE_Bool g_bIsMallocNegData = FALSE;
static SANE_Bool ReadScannedData (LPIMAGEROWS pImageRows); static unsigned int g_dwAlreadyGetNegLines = 0;
static SANE_Bool StopScan (void);
static SANE_Bool IsTAConnected (void); static SANE_Bool IsTAConnected (void);
static void AutoLevel (SANE_Byte *lpSource, COLORMODE colorMode, unsigned short ScanLines, static void AutoLevel (SANE_Byte *lpSource, COLORMODE colorMode, unsigned short ScanLines,
unsigned int BytesPerLine); unsigned int BytesPerLine);
static size_t max_string_size (const SANE_String_Const strings[]);
static SANE_Status calc_parameters (Mustek_Scanner * s);
#ifdef SANE_UNUSED
static SANE_Bool GetKeyStatus (SANE_Byte * pKey);
static void QBetChange (SANE_Byte *lpSource, COLORMODE colorMode, unsigned short ScanLines,
unsigned int BytesPerLine);
static void QBETDetectAutoLevel (void *pDIB, unsigned int ImageWidth, unsigned int ImageHeight);
#endif
@ -498,12 +491,6 @@ init_options (Mustek_Scanner * s)
return SANE_STATUS_GOOD; return SANE_STATUS_GOOD;
} }
static SANE_Byte * g_lpNegImageData = NULL;
static SANE_Bool g_bIsFirstGetNegData = TRUE;
static SANE_Bool g_bIsMallocNegData = FALSE;
static unsigned int g_dwAlreadyGetNegLines = 0;
/********************************************************************** /**********************************************************************
set scan parameters set scan parameters
Parameters: Parameters:
@ -569,7 +556,7 @@ SetParameters (LPSETPARAMETERS pSetParameters)
/*4. Scan area */ /*4. Scan area */
if (pSetParameters->fmArea.x1 >= pSetParameters->fmArea.x2) if (pSetParameters->fmArea.x1 >= pSetParameters->fmArea.x2)
{ {
DBG (DBG_ERR, "SetParameters: x1 > x2, error\n"); DBG (DBG_ERR, "SetParameters: x1 >= x2, error\n");
return FALSE; return FALSE;
} }
if (pSetParameters->fmArea.y1 >= pSetParameters->fmArea.y2) if (pSetParameters->fmArea.y1 >= pSetParameters->fmArea.y2)
@ -629,10 +616,7 @@ SetParameters (LPSETPARAMETERS pSetParameters)
DBG (DBG_ERR, "SetParameters: LinearThreshold error\n"); DBG (DBG_ERR, "SetParameters: LinearThreshold error\n");
return FALSE; return FALSE;
} }
else g_wLineartThreshold = pSetParameters->wLinearThreshold;
{
g_wLineartThreshold = pSetParameters->wLinearThreshold;
}
/*7. Gamma table */ /*7. Gamma table */
if (NULL != pSetParameters->pGammaTable) if (NULL != pSetParameters->pGammaTable)
@ -752,7 +736,7 @@ Return value:
TRUE if operation is success, FALSE otherwise TRUE if operation is success, FALSE otherwise
***********************************************************************/ ***********************************************************************/
static SANE_Bool static SANE_Bool
StartScan () StartScan (void)
{ {
DBG (DBG_FUNC, "StartScan: start\n"); DBG (DBG_FUNC, "StartScan: start\n");
if (ST_Reflective == g_ScanType) if (ST_Reflective == g_ScanType)
@ -924,7 +908,7 @@ Return value:
TRUE if operation is success, FALSE otherwise TRUE if operation is success, FALSE otherwise
***********************************************************************/ ***********************************************************************/
static SANE_Bool static SANE_Bool
StopScan () StopScan (void)
{ {
SANE_Bool rt; SANE_Bool rt;
int i; int i;
@ -977,11 +961,11 @@ Return value:
TRUE if TA is connected, FALSE otherwise TRUE if TA is connected, FALSE otherwise
***********************************************************************/ ***********************************************************************/
static SANE_Bool static SANE_Bool
IsTAConnected () IsTAConnected (void)
{ {
SANE_Bool hasTA; SANE_Bool hasTA;
DBG (DBG_FUNC, "StopScan: start\n"); DBG (DBG_FUNC, "IsTAConnected: start\n");
if (Asic_Open (&g_chip) != STATUS_GOOD) if (Asic_Open (&g_chip) != STATUS_GOOD)
{ {
@ -996,7 +980,7 @@ IsTAConnected ()
Asic_Close (&g_chip); Asic_Close (&g_chip);
DBG (DBG_FUNC, "StopScan: exit\n"); DBG (DBG_FUNC, "IsTAConnected: exit\n");
return hasTA; return hasTA;
} }
@ -1844,7 +1828,6 @@ sane_exit (void)
devlist = NULL; devlist = NULL;
} }
devlist = NULL;
DBG (DBG_FUNC, "sane_exit: exit\n"); DBG (DBG_FUNC, "sane_exit: exit\n");
} }
@ -1856,10 +1839,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
local_only == SANE_TRUE ? "true" : "false"); local_only == SANE_TRUE ? "true" : "false");
if (devlist != NULL) if (devlist != NULL)
{ free (devlist);
free (devlist);
devlist = NULL;
}
devlist = malloc ((num_devices + 1) * sizeof (devlist[0])); devlist = malloc ((num_devices + 1) * sizeof (devlist[0]));
if (devlist == NULL) if (devlist == NULL)