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

Remove unused code and fix indentation in mustek_usb2_high.c.

merge-requests/1/head
Jan Hauffa 2011-03-10 01:39:01 +01:00 zatwierdzone przez m. allan noah
rodzic 3f7cf8a65f
commit ca1e0db16f
5 zmienionych plików z 72 dodań i 170 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
backend/mustek_usb2.c
Wyświetl plik

@ -552,7 +552,6 @@ SetParameters (LPSETPARAMETERS pSetParameters)
(unsigned short) ((unsigned int) (pSetParameters->fmArea.y2) * (unsigned short) ((unsigned int) (pSetParameters->fmArea.y2) *
(unsigned int) (pSetParameters->wTargetDPI) / 300L); (unsigned int) (pSetParameters->wTargetDPI) / 300L);
g_tiTarget.isOptimalSpeed = TRUE;
g_tiTarget.wDpi = pSetParameters->wTargetDPI; g_tiTarget.wDpi = pSetParameters->wTargetDPI;
g_tiTarget.wX = X1inTargetDpi; g_tiTarget.wX = X1inTargetDpi;
g_tiTarget.wY = Y1inTargetDpi; g_tiTarget.wY = Y1inTargetDpi;

136
backend/mustek_usb2_high.c
Wyświetl plik

@ -169,7 +169,6 @@ MustScanner_Init (void)
Asic_Close (&g_chip); Asic_Close (&g_chip);
DBG (DBG_FUNC, "MustScanner_Init: leave MustScanner_Init\n"); DBG (DBG_FUNC, "MustScanner_Init: leave MustScanner_Init\n");
return TRUE; return TRUE;
} }
@ -344,7 +343,6 @@ MustScanner_FiltLower (unsigned short * pSort, unsigned short TotalCount,
unsigned short i, j; unsigned short i, j;
for (i = 0; i < Bound; i++) for (i = 0; i < Bound; i++)
{ {
for (j = 0; j < Bound - i; j++) for (j = 0; j < Bound - i; j++)
{ {
@ -457,7 +455,6 @@ MustScanner_GetRgb48BitLine (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetRgb48BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetRgb48BitLine: thread exit\n");
break; break;
} }
} }
@ -961,7 +958,6 @@ MustScanner_GetRgb48BitLine1200DPI (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
DBG (DBG_FUNC, DBG (DBG_FUNC,
"MustScanner_GetRgb48BitLine1200DPI: thread exit\n"); "MustScanner_GetRgb48BitLine1200DPI: thread exit\n");
break; break;
} }
} }
@ -1102,7 +1098,6 @@ MustScanner_GetRgb24BitLine (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetRgb24BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetRgb24BitLine: thread exit\n");
break; break;
} }
} }
@ -1206,7 +1201,6 @@ MustScanner_GetRgb24BitLine (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetRgb24BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetRgb24BitLine: thread exit\n");
break; break;
} }
} /* end for */ } /* end for */
@ -1438,7 +1432,6 @@ MustScanner_GetRgb24BitLine1200DPI (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, DBG (DBG_FUNC,
"MustScanner_GetRgb24BitLine1200DPI: thread exit\n"); "MustScanner_GetRgb24BitLine1200DPI: thread exit\n");
break; break;
} }
@ -1627,8 +1620,6 @@ MustScanner_GetRgb24BitLine1200DPI (SANE_Byte * lpLine, SANE_Bool isOrderInvert,
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, DBG (DBG_FUNC,
"MustScanner_GetRgb24BitLine1200DPI: thread exit\n"); "MustScanner_GetRgb24BitLine1200DPI: thread exit\n");
break; break;
} }
} }
@ -1707,7 +1698,6 @@ MustScanner_GetMono16BitLine (SANE_Byte * lpLine, unsigned short * wLinesCount)
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetMono16BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetMono16BitLine: thread exit\n");
break; break;
} }
} }
@ -1843,7 +1833,6 @@ MustScanner_GetMono16BitLine1200DPI (SANE_Byte * lpLine,
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, DBG (DBG_FUNC,
"MustScanner_GetMono16BitLine1200DPI: thread exit\n"); "MustScanner_GetMono16BitLine1200DPI: thread exit\n");
break; break;
} }
} }
@ -1948,7 +1937,6 @@ MustScanner_GetMono8BitLine (SANE_Byte * lpLine, unsigned short * wLinesCount)
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetMono8BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetMono8BitLine: thread exit\n");
break; break;
} }
} }
@ -2007,7 +1995,6 @@ MustScanner_GetMono8BitLine1200DPI (SANE_Byte * lpLine,
if (GetScannedLines () > g_wtheReadyLines) if (GetScannedLines () > g_wtheReadyLines)
{ {
if (ST_Reflective == g_ScanType) if (ST_Reflective == g_ScanType)
{ {
wLinePosOdd = wLinePosOdd =
(g_wtheReadyLines - g_wPixelDistance) % g_wMaxScanLines; (g_wtheReadyLines - g_wPixelDistance) % g_wMaxScanLines;
@ -2020,7 +2007,6 @@ MustScanner_GetMono8BitLine1200DPI (SANE_Byte * lpLine,
wLinePosOdd = (g_wtheReadyLines) % g_wMaxScanLines; wLinePosOdd = (g_wtheReadyLines) % g_wMaxScanLines;
} }
for (i = 0; i < g_SWWidth;) for (i = 0; i < g_SWWidth;)
{ {
if ((i + 1) != g_SWWidth) if ((i + 1) != g_SWWidth)
@ -2065,7 +2051,6 @@ MustScanner_GetMono8BitLine1200DPI (SANE_Byte * lpLine,
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetMono8BitLine1200DPI: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetMono8BitLine1200DPI: thread exit\n");
break; break;
} }
} }
@ -2079,9 +2064,7 @@ MustScanner_GetMono8BitLine1200DPI (SANE_Byte * lpLine,
{ {
g_lpBefLineImageData = malloc (g_SWBytesPerRow); g_lpBefLineImageData = malloc (g_SWBytesPerRow);
if (NULL == g_lpBefLineImageData) if (NULL == g_lpBefLineImageData)
{
return FALSE; return FALSE;
}
memset (g_lpBefLineImageData, 0, g_SWBytesPerRow); memset (g_lpBefLineImageData, 0, g_SWBytesPerRow);
memcpy (g_lpBefLineImageData, lpTemp, g_SWBytesPerRow); memcpy (g_lpBefLineImageData, lpTemp, g_SWBytesPerRow);
g_bIsFirstReadBefData = FALSE; g_bIsFirstReadBefData = FALSE;
@ -2134,7 +2117,6 @@ MustScanner_GetMono1BitLine (SANE_Byte * lpLine, unsigned short * wLinesCount)
memset (lpLine, 0, wWantedTotalLines * g_SWWidth / 8); memset (lpLine, 0, wWantedTotalLines * g_SWWidth / 8);
for (TotalXferLines = 0; TotalXferLines < wWantedTotalLines;) for (TotalXferLines = 0; TotalXferLines < wWantedTotalLines;)
{ {
if (g_dwTotalTotalXferLines >= g_SWHeight) if (g_dwTotalTotalXferLines >= g_SWHeight)
{ {
@ -2155,10 +2137,8 @@ MustScanner_GetMono1BitLine (SANE_Byte * lpLine, unsigned short * wLinesCount)
{ {
if (*(g_lpReadImageHead + wLinePos * g_BytesPerRow + i) > if (*(g_lpReadImageHead + wLinePos * g_BytesPerRow + i) >
g_wLineartThreshold) g_wLineartThreshold)
{
*(lpLine + i / 8) += (0x80 >> (i % 8)); *(lpLine + i / 8) += (0x80 >> (i % 8));
} }
}
TotalXferLines++; TotalXferLines++;
g_dwTotalTotalXferLines++; g_dwTotalTotalXferLines++;
@ -2170,7 +2150,6 @@ MustScanner_GetMono1BitLine (SANE_Byte * lpLine, unsigned short * wLinesCount)
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetMono1BitLine: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetMono1BitLine: thread exit\n");
break; break;
} }
} }
@ -2237,8 +2216,6 @@ MustScanner_GetMono1BitLine1200DPI (SANE_Byte * lpLine,
(g_wtheReadyLines - g_wPixelDistance) % g_wMaxScanLines; (g_wtheReadyLines - g_wPixelDistance) % g_wMaxScanLines;
} }
for (i = 0; i < g_SWWidth;) for (i = 0; i < g_SWWidth;)
{ {
if ((i + 1) != g_SWWidth) if ((i + 1) != g_SWWidth)
@ -2248,9 +2225,7 @@ MustScanner_GetMono1BitLine1200DPI (SANE_Byte * lpLine,
*(lpLine + i / 8) += (0x80 >> (i % 8)); *(lpLine + i / 8) += (0x80 >> (i % 8));
i++; i++;
if (i >= g_SWWidth) if (i >= g_SWWidth)
{
break; break;
}
if (*(g_lpReadImageHead + wLinePosEven * g_BytesPerRow + i) if (*(g_lpReadImageHead + wLinePosEven * g_BytesPerRow + i)
> g_wLineartThreshold) > g_wLineartThreshold)
@ -2263,15 +2238,12 @@ MustScanner_GetMono1BitLine1200DPI (SANE_Byte * lpLine,
g_dwTotalTotalXferLines++; g_dwTotalTotalXferLines++;
lpLine += g_SWBytesPerRow / 8; lpLine += g_SWBytesPerRow / 8;
AddReadyLines (); AddReadyLines ();
} }
if (g_isCanceled) if (g_isCanceled)
{ {
pthread_cancel (g_threadid_readimage); pthread_cancel (g_threadid_readimage);
pthread_join (g_threadid_readimage, NULL); pthread_join (g_threadid_readimage, NULL);
DBG (DBG_FUNC, "MustScanner_GetMono1BitLine1200DPI: thread exit\n"); DBG (DBG_FUNC, "MustScanner_GetMono1BitLine1200DPI: thread exit\n");
break; break;
} }
} /* end for */ } /* end for */
@ -2316,14 +2288,11 @@ MustScanner_PrepareCalculateMaxMin (unsigned short wResolution)
} }
if (g_nDarkSecLength <= 0) if (g_nDarkSecLength <= 0)
{
g_nDarkSecLength = 1; g_nDarkSecLength = 1;
}
g_wStartPosition = 13 * wResolution / 1200; g_wStartPosition = 13 * wResolution / 1200;
g_wCalWidth -= g_wStartPosition; g_wCalWidth -= g_wStartPosition;
/* start of find max value */ /* start of find max value */
g_nSecNum = (int) (g_wCalWidth / g_nSecLength); g_nSecNum = (int) (g_wCalWidth / g_nSecLength);
@ -2333,27 +2302,18 @@ MustScanner_PrepareCalculateMaxMin (unsigned short wResolution)
static void static void
MustScanner_CalculateMaxMin (SANE_Byte * pBuffer, unsigned short * lpMaxValue, MustScanner_CalculateMaxMin (SANE_Byte * pBuffer, unsigned short * lpMaxValue,
unsigned short * lpMinValue, unsigned short * lpMinValue)
unsigned short wResolution)
{ {
unsigned short *wSecData = NULL, *wDarkSecData = NULL; unsigned short *wSecData = NULL, *wDarkSecData = NULL;
int i, j; int i, j;
wResolution = wResolution;
wSecData = malloc (sizeof (unsigned short) * g_nSecNum); wSecData = malloc (sizeof (unsigned short) * g_nSecNum);
if (wSecData == NULL) if (wSecData == NULL)
{
return; return;
}
else
{
memset (wSecData, 0, g_nSecNum * sizeof (unsigned short)); memset (wSecData, 0, g_nSecNum * sizeof (unsigned short));
}
for (i = 0; i < g_nSecNum; i++) for (i = 0; i < g_nSecNum; i++)
{ {
for (j = 0; j < g_nSecLength; j++) for (j = 0; j < g_nSecLength; j++)
wSecData[i] += *(pBuffer + g_wStartPosition + i * g_nSecLength + j); wSecData[i] += *(pBuffer + g_wStartPosition + i * g_nSecLength + j);
wSecData[i] >>= g_nPowerNum; wSecData[i] >>= g_nPowerNum;
@ -2365,18 +2325,12 @@ MustScanner_CalculateMaxMin (SANE_Byte * pBuffer, unsigned short * lpMaxValue,
if (*lpMaxValue < wSecData[i]) if (*lpMaxValue < wSecData[i])
*lpMaxValue = wSecData[i]; *lpMaxValue = wSecData[i];
} }
free (wSecData); free (wSecData);
wDarkSecData = malloc (sizeof (unsigned short) * g_nDarkSecNum); wDarkSecData = malloc (sizeof (unsigned short) * g_nDarkSecNum);
if (wDarkSecData == NULL) if (wDarkSecData == NULL)
{
return; return;
}
else
{
memset (wDarkSecData, 0, g_nDarkSecNum * sizeof (unsigned short)); memset (wDarkSecData, 0, g_nDarkSecNum * sizeof (unsigned short));
}
for (i = 0; i < g_nDarkSecNum; i++) for (i = 0; i < g_nDarkSecNum; i++)
{ {
@ -2605,10 +2559,7 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
} }
} }
if (s_wOpticalDpi[i] == 0) if (s_wOpticalDpi[i] == 0)
{ pSuggest->wYDpi = s_wOpticalDpi[--i];
i--;
pSuggest->wYDpi = s_wOpticalDpi[i];
}
/* 2. Look up optical X resolution */ /* 2. Look up optical X resolution */
for (i = 0; s_wOpticalDpi[i] != 0; i++) for (i = 0; s_wOpticalDpi[i] != 0; i++)
@ -2620,10 +2571,7 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
} }
} }
if (s_wOpticalDpi[i] == 0) if (s_wOpticalDpi[i] == 0)
{ pSuggest->wXDpi = s_wOpticalDpi[--i];
i--;
pSuggest->wXDpi = s_wOpticalDpi[i];
}
DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wDpi = %d\n", DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wDpi = %d\n",
pTarget->wDpi); pTarget->wDpi);
@ -2633,16 +2581,16 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
pSuggest->wYDpi); pSuggest->wYDpi);
/* 3. suggest scan area */ /* 3. suggest scan area */
pSuggest->wX = (unsigned short) (((unsigned int) (pTarget->wX) * pSuggest->wX = (unsigned short) (((unsigned int) pTarget->wX *
(unsigned int) (pSuggest->wXDpi)) / (unsigned int) (pTarget->wDpi)); pSuggest->wXDpi) / pTarget->wDpi);
pSuggest->wY = (unsigned short) (((unsigned int) (pTarget->wY) * pSuggest->wY = (unsigned short) (((unsigned int) pTarget->wY *
(unsigned int) (pSuggest->wYDpi)) / (unsigned int) (pTarget->wDpi)); pSuggest->wYDpi) / pTarget->wDpi);
pSuggest->wWidth = (unsigned short) (((unsigned int) (pTarget->wWidth) * pSuggest->wWidth = (unsigned short) (((unsigned int) pTarget->wWidth *
(unsigned int) (pSuggest->wXDpi)) / (unsigned int) (pTarget->wDpi)); pSuggest->wXDpi) / pTarget->wDpi);
pSuggest->wHeight = (unsigned short) (((unsigned int) (pTarget->wHeight) * pSuggest->wHeight = (unsigned short) (((unsigned int) pTarget->wHeight *
(unsigned int) (pSuggest->wYDpi)) / (unsigned int) (pTarget->wDpi)); pSuggest->wYDpi) / pTarget->wDpi);
pSuggest->wWidth = (pSuggest->wWidth / 2) * 2; pSuggest->wWidth &= ~1;
DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wX = %d\n", pTarget->wX); DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wX = %d\n", pTarget->wX);
DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wY = %d\n", pTarget->wY); DBG (DBG_FUNC, "MustScanner_ScanSuggest: pTarget->wY = %d\n", pTarget->wY);
@ -2660,7 +2608,7 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
if (pTarget->cmColorMode == CM_TEXT) if (pTarget->cmColorMode == CM_TEXT)
{ {
pSuggest->wWidth = ((pSuggest->wWidth + 7) >> 3) << 3; pSuggest->wWidth = (pSuggest->wWidth + 7) & ~7;
if (pSuggest->wWidth < 8) if (pSuggest->wWidth < 8)
pSuggest->wWidth = 8; pSuggest->wWidth = 8;
} }
@ -2673,7 +2621,7 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
DBG (DBG_FUNC, "MustScanner_ScanSuggest: wMaxHeight = %d\n", wMaxHeight); DBG (DBG_FUNC, "MustScanner_ScanSuggest: wMaxHeight = %d\n", wMaxHeight);
if (CM_TEXT == pTarget->cmColorMode) if (CM_TEXT == pTarget->cmColorMode)
wMaxWidth = (wMaxWidth >> 3) << 3; wMaxWidth &= ~7;
if (pSuggest->wWidth > wMaxWidth) if (pSuggest->wWidth > wMaxWidth)
pSuggest->wWidth = wMaxWidth; pSuggest->wWidth = wMaxWidth;
@ -2682,67 +2630,36 @@ MustScanner_ScanSuggest (PTARGETIMAGE pTarget, PSUGGESTSETTING pSuggest)
DBG (DBG_FUNC, "MustScanner_ScanSuggest: g_Width=%d\n", g_Width); DBG (DBG_FUNC, "MustScanner_ScanSuggest: g_Width=%d\n", g_Width);
g_Width = ((pSuggest->wWidth + 15) >> 4) << 4; /* real scan width */ g_Width = (pSuggest->wWidth + 15) & ~15; /* real scan width */
DBG (DBG_FUNC, "MustScanner_ScanSuggest: again, g_Width=%d\n", g_Width); DBG (DBG_FUNC, "MustScanner_ScanSuggest: again, g_Width=%d\n", g_Width);
g_Height = pSuggest->wHeight; g_Height = pSuggest->wHeight;
if (pTarget->isOptimalSpeed)
{
switch (pTarget->cmColorMode) switch (pTarget->cmColorMode)
{ {
case CM_RGB48: case CM_RGB48:
pSuggest->cmScanMode = CM_RGB48; pSuggest->cmScanMode = CM_RGB48;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 6); pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth * 6);
break; break;
case CM_RGB24: case CM_RGB24:
pSuggest->cmScanMode = CM_RGB24ext; pSuggest->cmScanMode = CM_RGB24ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 3); pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth * 3);
break; break;
case CM_GRAY16: case CM_GRAY16:
pSuggest->cmScanMode = CM_GRAY16ext; pSuggest->cmScanMode = CM_GRAY16ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 2); pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth * 2);
break; break;
case CM_GRAY8: case CM_GRAY8:
pSuggest->cmScanMode = CM_GRAY8ext; pSuggest->cmScanMode = CM_GRAY8ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth)); pSuggest->dwBytesPerRow = (unsigned int) pSuggest->wWidth;
break; break;
case CM_TEXT: case CM_TEXT:
pSuggest->cmScanMode = CM_TEXT; pSuggest->cmScanMode = CM_TEXT;
pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth) / 8; pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth / 8);
break; break;
default: default:
break; return FALSE;
}
}
else
{
switch (pTarget->cmColorMode)
{
case CM_RGB48:
pSuggest->cmScanMode = CM_RGB48;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 6);
break;
case CM_RGB24:
pSuggest->cmScanMode = CM_RGB24ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 3);
break;
case CM_GRAY16:
pSuggest->cmScanMode = CM_GRAY16ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth) * 2);
break;
case CM_GRAY8:
pSuggest->cmScanMode = CM_GRAY8ext;
pSuggest->dwBytesPerRow = (unsigned int) ((pSuggest->wWidth));
break;
case CM_TEXT:
pSuggest->cmScanMode = CM_TEXT;
pSuggest->dwBytesPerRow = (unsigned int) (pSuggest->wWidth) / 8;
break;
default:
break;
}
} }
DBG (DBG_FUNC, "MustScanner_ScanSuggest: pSuggest->dwBytesPerRow = %d\n", DBG (DBG_FUNC, "MustScanner_ScanSuggest: pSuggest->dwBytesPerRow = %d\n",
@ -2755,14 +2672,9 @@ static SANE_Bool
MustScanner_StopScan (void) MustScanner_StopScan (void)
{ {
DBG (DBG_FUNC, "MustScanner_StopScan: call in\n"); DBG (DBG_FUNC, "MustScanner_StopScan: call in\n");
if (!g_bOpened) if (!g_bOpened || !g_bPrepared)
{ {
DBG (DBG_FUNC, "MustScanner_StopScan: scanner not opened\n"); DBG (DBG_FUNC, "MustScanner_StopScan: scanner not opened or prepared\n");
return FALSE;
}
if (!g_bPrepared)
{
DBG (DBG_FUNC, "MustScanner_StopScan: scanner not prepared\n");
return FALSE; return FALSE;
} }
@ -2879,7 +2791,7 @@ MustScanner_GetRows (SANE_Byte * lpBlock, unsigned short * Rows,
return MustScanner_GetMono1BitLine (lpBlock, Rows); return MustScanner_GetMono1BitLine (lpBlock, Rows);
default: default:
return FALSE; break;
} }
DBG (DBG_FUNC, "MustScanner_GetRows: leave MustScanner_GetRows\n"); DBG (DBG_FUNC, "MustScanner_GetRows: leave MustScanner_GetRows\n");

4
backend/mustek_usb2_high.h
Wyświetl plik

@ -109,7 +109,6 @@ typedef struct
typedef struct typedef struct
{ {
SANE_Bool isOptimalSpeed;
COLORMODE cmColorMode; COLORMODE cmColorMode;
unsigned short wDpi; unsigned short wDpi;
unsigned short wX; unsigned short wX;
@ -212,8 +211,7 @@ static void *MustScanner_ReadDataFromScanner (void * dummy);
static void MustScanner_PrepareCalculateMaxMin (unsigned short wResolution); static void MustScanner_PrepareCalculateMaxMin (unsigned short wResolution);
static void MustScanner_CalculateMaxMin (SANE_Byte * pBuffer, static void MustScanner_CalculateMaxMin (SANE_Byte * pBuffer,
unsigned short * lpMaxValue, unsigned short * lpMaxValue,
unsigned short * lpMinValue, unsigned short * lpMinValue);
unsigned short wResolution);
static SANE_Bool MustScanner_ScanSuggest (PTARGETIMAGE pTarget, static SANE_Bool MustScanner_ScanSuggest (PTARGETIMAGE pTarget,
PSUGGESTSETTING pSuggest); PSUGGESTSETTING pSuggest);
static SANE_Bool MustScanner_StopScan (void); static SANE_Bool MustScanner_StopScan (void);

21
backend/mustek_usb2_reflective.c
Wyświetl plik

@ -444,12 +444,11 @@ Reflective_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
if (g_chip.AD.DirectionR == 0) if (g_chip.AD.DirectionR == 0)
{ {
@ -561,12 +560,11 @@ Reflective_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
DBG (DBG_FUNC, "Reflective_AdjustAD: " DBG (DBG_FUNC, "Reflective_AdjustAD: "
"RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n", "RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n",
@ -763,12 +761,11 @@ Reflective_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
DBG (DBG_FUNC, "Reflective_AdjustAD: " DBG (DBG_FUNC, "Reflective_AdjustAD: "
"RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n", "RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n",

22
backend/mustek_usb2_transparent.c
Wyświetl plik

@ -171,7 +171,6 @@ Transparent_SetupScan (COLORMODE ColorMode,
case 600: case 600:
g_wPixelDistance = 0; /* no even & odd problem */ g_wPixelDistance = 0; /* no even & odd problem */
g_wLineDistance = 12; g_wLineDistance = 12;
g_Height += g_wPixelDistance;
break; break;
case 300: case 300:
g_wPixelDistance = 0; g_wPixelDistance = 0;
@ -427,12 +426,11 @@ Transparent_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
if (g_chip.AD.DirectionR == 0) if (g_chip.AD.DirectionR == 0)
{ {
@ -532,12 +530,11 @@ Transparent_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
DBG (DBG_FUNC, "Transparent_AdjustAD: " DBG (DBG_FUNC, "Transparent_AdjustAD: "
"RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n", "RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n",
@ -733,12 +730,11 @@ Transparent_AdjustAD (void)
Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24); Asic_ReadCalibrationData (&g_chip, lpCalData, wCalWidth * 3, 24);
Asic_ScanStop (&g_chip); Asic_ScanStop (&g_chip);
MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR, MustScanner_CalculateMaxMin (lpCalData, &wMaxValueR, &wMinValueR);
wAdjustADResolution);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG, MustScanner_CalculateMaxMin (lpCalData + wCalWidth, &wMaxValueG,
&wMinValueG, wAdjustADResolution); &wMinValueG);
MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB, MustScanner_CalculateMaxMin (lpCalData + wCalWidth * 2, &wMaxValueB,
&wMinValueB, wAdjustADResolution); &wMinValueB);
DBG (DBG_FUNC, DBG (DBG_FUNC,
"Transparent_AdjustAD: " "Transparent_AdjustAD: "
"RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n", "RGain=%d, ROffset=%d, RDir=%d GGain=%d, GOffset=%d, GDir=%d BGain=%d, BOffset=%d, BDir=%d\n",