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

Fix some misuse of SENSOR_DPI constant.

merge-requests/1/head
Jan Hauffa 2011-05-08 17:39:31 +02:00 zatwierdzone przez m. allan noah
rodzic 30e3907156
commit ceb7d29690
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/mustek_usb2_asic.c
Wyświetl plik

@ -2294,7 +2294,7 @@ Asic_SetWindow (ASIC * chip, SCANSOURCE lsLightSource,
SendData (chip, ES01_F6_MotorControl1, SendData (chip, ES01_F6_MotorControl1,
SPEED_UNIT_1_PIXEL_TIME | MOTOR_SYNC_UNIT_1_PIXEL_TIME); SPEED_UNIT_1_PIXEL_TIME | MOTOR_SYNC_UNIT_1_PIXEL_TIME);
if ((ScanType == SCAN_TYPE_NORMAL) && (wYResolution >= SENSOR_DPI)) if ((ScanType == SCAN_TYPE_NORMAL) && (wYResolution >= 1200))
bMotorMoveType = _8_TABLE_SPACE_FOR_1_DIV_2_STEP; bMotorMoveType = _8_TABLE_SPACE_FOR_1_DIV_2_STEP;
else else
bMotorMoveType = _4_TABLE_SPACE_FOR_FULL_STEP; bMotorMoveType = _4_TABLE_SPACE_FOR_FULL_STEP;
@ -2333,14 +2333,14 @@ Asic_SetWindow (ASIC * chip, SCANSOURCE lsLightSource,
{ {
SetExtraSettings (chip, wXResolution, wCCD_PixelNumber, SANE_FALSE); SetExtraSettings (chip, wXResolution, wCCD_PixelNumber, SANE_FALSE);
SetMotorStepTable (chip, &pMotorStepsTable, wY, SetMotorStepTable (chip, &pMotorStepsTable, wY,
wHeight * SENSOR_DPI / wYResolution * wMultiMotorStep, wHeight * 1200 / wYResolution * wMultiMotorStep,
wYResolution); wYResolution);
} }
else else
{ {
SetExtraSettings (chip, wXResolution, wCCD_PixelNumber, SANE_TRUE); SetExtraSettings (chip, wXResolution, wCCD_PixelNumber, SANE_TRUE);
SetMotorStepTableForCalibration (chip, &pMotorStepsTable, SetMotorStepTableForCalibration (chip, &pMotorStepsTable,
wHeight * SENSOR_DPI / wYResolution * wMultiMotorStep); wHeight * 1200 / wYResolution * wMultiMotorStep);
} }
/* calculate line time */ /* calculate line time */
@ -2348,7 +2348,7 @@ Asic_SetWindow (ASIC * chip, SCANSOURCE lsLightSource,
(chip->Timing.PHTG_WaitWidth + 1) + (chip->Timing.PHTG_WaitWidth + 1) +
(wCCD_PixelNumber + 1)) * (bDummyCycleNum + 1); (wCCD_PixelNumber + 1)) * (bDummyCycleNum + 1);
EndSpeed = (dwLinePixelReport * wYResolution / SENSOR_DPI) / wMultiMotorStep; EndSpeed = (dwLinePixelReport * wYResolution / 1200) / wMultiMotorStep;
DBG (DBG_ASIC, "motor time = %d\n", EndSpeed); DBG (DBG_ASIC, "motor time = %d\n", EndSpeed);
if (EndSpeed > 0xffff) if (EndSpeed > 0xffff)
{ {