From ce6d7010d3fc0bfc5a54cd3411660db43e382bac Mon Sep 17 00:00:00 2001 From: Jan Hauffa Date: Tue, 8 Mar 2011 18:15:30 +0100 Subject: [PATCH] Pixel flavor is never PF_WhiteIs0, so the associated code can be removed. --- backend/mustek_usb2.c | 19 +------------------ backend/mustek_usb2_high.c | 2 -- backend/mustek_usb2_high.h | 6 ------ backend/mustek_usb2_reflective.c | 5 ++--- backend/mustek_usb2_transparent.c | 5 ++--- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/backend/mustek_usb2.c b/backend/mustek_usb2.c index 8863cc7ed..65dbdf5bb 100644 --- a/backend/mustek_usb2.c +++ b/backend/mustek_usb2.c @@ -242,7 +242,6 @@ calc_parameters (Mustek_Scanner * s) s->setpara.fmArea.y2 = (unsigned short) ((SANE_UNFIX (s->val[OPT_BR_Y].w) * 300.0) / MM_PER_INCH + 0.5); - s->setpara.pfPixelFlavor = PF_BlackIs0; s->setpara.wLinearThreshold = s->val[OPT_THRESHOLD].w; s->setpara.wTargetDPI = s->val[OPT_RESOLUTION].w; @@ -518,18 +517,6 @@ SetParameters (LPSETPARAMETERS pSetParameters) return FALSE; } - /*3. pixel flavor */ - if (PF_BlackIs0 == pSetParameters->pfPixelFlavor - || PF_WhiteIs0 == pSetParameters->pfPixelFlavor) - { - g_PixelFlavor = pSetParameters->pfPixelFlavor; - } - else - { - DBG (DBG_ERR, "SetParameters: PixelFlavor error\n"); - return FALSE; - } - /*4. Scan area */ if (pSetParameters->fmArea.x1 >= pSetParameters->fmArea.x2) { @@ -723,7 +710,6 @@ StartScan (void) return Reflective_SetupScan (g_ssSuggest.cmScanMode, g_ssSuggest.wXDpi, g_ssSuggest.wYDpi, - PF_BlackIs0, g_ssSuggest.wX, g_ssSuggest.wY, g_ssSuggest.wWidth, g_ssSuggest.wHeight); @@ -737,7 +723,6 @@ StartScan (void) return Transparent_SetupScan (g_ssSuggest.cmScanMode, g_ssSuggest.wXDpi, g_ssSuggest.wYDpi, - PF_BlackIs0, g_ssSuggest.wX, g_ssSuggest.wY, g_ssSuggest.wWidth, g_ssSuggest.wHeight); @@ -784,7 +769,7 @@ ReadScannedData (LPIMAGEROWS pImageRows) pImageRows->wXferedLineNum = Rows; - if (g_PixelFlavor == PF_WhiteIs0 || g_ScanMode == CM_TEXT) + if (g_ScanMode == CM_TEXT) { int TotalSize = Rows * g_ssSuggest.dwBytesPerRow; for (i = 0; i < TotalSize; i++) @@ -1647,8 +1632,6 @@ sane_start (SANE_Handle handle) s->setpara.fmArea.y1); DBG (DBG_INFO, "Sane_start:setpara ,setpara.fmArea.y2=%d\n", s->setpara.fmArea.y2); - DBG (DBG_INFO, "Sane_start:setpara ,setpara.pfPixelFlavor=%d\n", - s->setpara.pfPixelFlavor); DBG (DBG_INFO, "Sane_start:setpara ,setpara.wLinearThreshold=%d\n", s->setpara.wLinearThreshold); DBG (DBG_INFO, "Sane_start:setpara ,setpara.wTargetDPI=%d\n", diff --git a/backend/mustek_usb2_high.c b/backend/mustek_usb2_high.c index eda11409c..f390bd249 100644 --- a/backend/mustek_usb2_high.c +++ b/backend/mustek_usb2_high.c @@ -100,7 +100,6 @@ static COLORMODE g_ScanMode; static TARGETIMAGE g_tiTarget; static SCANTYPE g_ScanType = ST_Reflective; static SCANSOURCE g_ssScanSource; -static PIXELFLAVOR g_PixelFlavor; static SUGGESTSETTING g_ssSuggest; static Asic g_chip; @@ -171,7 +170,6 @@ MustScanner_Init (void) g_pGammaTable = NULL; g_ssScanSource = SS_Reflective; - g_PixelFlavor = PF_BlackIs0; Asic_Close (&g_chip); diff --git a/backend/mustek_usb2_high.h b/backend/mustek_usb2_high.h index da262e710..3381dcc14 100644 --- a/backend/mustek_usb2_high.h +++ b/backend/mustek_usb2_high.h @@ -50,11 +50,6 @@ /* const use in structures*/ -/*pixel flavor*/ -typedef SANE_Byte PIXELFLAVOR; -#define PF_BlackIs0 0x00 -#define PF_WhiteIs0 0x01 - /*scan source*/ typedef SANE_Byte SCANSOURCE; #define SS_Reflective 0x00 @@ -107,7 +102,6 @@ typedef struct tagSETPARAMETERS unsigned short wTargetDPI; COLORMODE cmColorMode; unsigned short wLinearThreshold; /*threshold for Line art mode */ - PIXELFLAVOR pfPixelFlavor; SCANSOURCE ssScanSource; unsigned short * pGammaTable; } SETPARAMETERS, *LPSETPARAMETERS; diff --git a/backend/mustek_usb2_reflective.c b/backend/mustek_usb2_reflective.c index 320a38eaa..6e091c141 100644 --- a/backend/mustek_usb2_reflective.c +++ b/backend/mustek_usb2_reflective.c @@ -48,7 +48,7 @@ static SANE_Bool Reflective_Reset (void); static SANE_Bool Reflective_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest); static SANE_Bool Reflective_SetupScan (COLORMODE ColorMode, unsigned short XDpi, unsigned short YDpi, - SANE_Bool isInvert, unsigned short X, unsigned short Y, unsigned short Width, + unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height); static SANE_Bool Reflective_StopScan (void); static SANE_Bool Reflective_GetRows (SANE_Byte * lpBlock, unsigned short * Rows, SANE_Bool isOrderInvert); @@ -328,9 +328,8 @@ static SANE_Bool Reflective_SetupScan (COLORMODE ColorMode, unsigned short XDpi, unsigned short YDpi, - SANE_Bool isInvert, unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height) + unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height) { - isInvert = isInvert; DBG (DBG_FUNC, "Reflective_SetupScan: Call in\n"); if (g_bOpened) { diff --git a/backend/mustek_usb2_transparent.c b/backend/mustek_usb2_transparent.c index efcbd1b69..70d43ad56 100644 --- a/backend/mustek_usb2_transparent.c +++ b/backend/mustek_usb2_transparent.c @@ -49,7 +49,7 @@ static SANE_Bool Transparent_Reset (void); static SANE_Bool Transparent_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest); static SANE_Bool Transparent_SetupScan (COLORMODE ColorMode, unsigned short XDpi, unsigned short YDpi, - SANE_Bool isInvert, unsigned short X, unsigned short Y, unsigned short Width, + unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height); static SANE_Bool Transparent_StopScan (void); static SANE_Bool Transparent_GetRows (SANE_Byte * lpBlock, unsigned short * Rows, SANE_Bool isOrderInvert); @@ -282,12 +282,11 @@ Return value: ***********************************************************************/ static SANE_Bool Transparent_SetupScan (COLORMODE ColorMode, unsigned short XDpi, unsigned short YDpi, - SANE_Bool isInvert, unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height) + unsigned short X, unsigned short Y, unsigned short Width, unsigned short Height) { SANE_Bool hasTA; unsigned short wTAShadingMinus = 0; - isInvert = isInvert; DBG (DBG_FUNC, "Transparent_SetupScan: call in\n"); if (g_bOpened)