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

improve calibration data allocation and freeing

merge-requests/1/head
Stphane Voltz 2009-11-24 06:44:47 +01:00
rodzic 9154cb7ee1
commit f8016c62e3
1 zmienionych plików z 47 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
backend/gt68xx_high.c
Wyświetl plik

@ -385,6 +385,8 @@ gt68xx_scanner_free_calibrators (GT68xx_Scanner * scanner)
SANE_Status
gt68xx_scanner_free (GT68xx_Scanner * scanner)
{
int i;
if (!scanner)
{
DBG (5, "gt68xx_scanner_free: scanner==NULL\n");
@ -399,6 +401,27 @@ gt68xx_scanner_free (GT68xx_Scanner * scanner)
gt68xx_scanner_free_calibrators (scanner);
/* free in memory calibration data */
for (i = 0; i < MAX_RESOLUTIONS; i++)
{
if (scanner->calibrations[i].red != NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].red);
}
if (scanner->calibrations[i].green != NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].green);
}
if (scanner->calibrations[i].blue != NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].blue);
}
if (scanner->calibrations[i].gray != NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].gray);
}
}
free (scanner);
return SANE_STATUS_GOOD;
@ -2018,6 +2041,29 @@ gt68xx_sheetfed_scanner_calibrate (GT68xx_Scanner * scanner)
DBG (3, "gt68xx_sheetfed_scanner_calibrate: start.\n");
/* clear calibration if needed */
gt68xx_scanner_free_calibrators (scanner);
for (i = 0; i < MAX_RESOLUTIONS; i++)
{
if(scanner->calibrations[i].red!=NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].red);
}
if(scanner->calibrations[i].green!=NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].green);
}
if(scanner->calibrations[i].blue!=NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].blue);
}
if(scanner->calibrations[i].gray!=NULL)
{
gt68xx_calibrator_free (scanner->calibrations[i].gray);
}
}
scanner->calibrated = SANE_FALSE;
/* find minimum horizontal resolution */
request.xdpi = 9600;
for (i = 0; scanner->dev->model->xdpi_values[i] != 0; i++)
@ -2274,7 +2320,7 @@ gt68xx_sheetfed_scanner_calibrate (GT68xx_Scanner * scanner)
/** @brief assign calibration for scan
* This function creates the calibrators and set up afe for the requested
* scan. It uses calibration data that has been created by
* gt68xx_sheetfed_scanner_callibrate.
* gt68xx_sheetfed_scanner_calibrate.
* @param scanner structure describing the frontend session and the device
* @return SANE_STATUS_GOOD is everything goes right, SANE_STATUS_INVAL
* otherwise.