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

fix calibration file name free

merge-requests/1/head
Stphane Voltz 2010-06-10 21:45:56 +02:00
rodzic edac97cdca
commit ee0c0e8c44
2 zmienionych plików z 6 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2010-06-10 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys.c:
calibration file name double free fix
2010-06-10 m. allan noah <kitno455 at gmail dot com> 2010-06-10 m. allan noah <kitno455 at gmail dot com>
* backend/niash.c: patch for HP3300 from Yves Jeanrenaud * backend/niash.c: patch for HP3300 from Yves Jeanrenaud
* po/fr.po: updates from Yann E. MORIN * po/fr.po: updates from Yann E. MORIN

3
backend/genesys.c
Wyświetl plik

@ -6922,7 +6922,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle)
{ {
sprintf (tmp_str, "%s/.sane/%s.cal", ptr, s->dev->model->name); sprintf (tmp_str, "%s/.sane/%s.cal", ptr, s->dev->model->name);
} }
FREE_IFNOT_NULL (s->dev->calib_file);
s->dev->calib_file = strdup (tmp_str); s->dev->calib_file = strdup (tmp_str);
DBG (DBG_info, "Calibration filename set to:\n"); DBG (DBG_info, "Calibration filename set to:\n");
DBG (DBG_info, ">%s<\n", s->dev->calib_file); DBG (DBG_info, ">%s<\n", s->dev->calib_file);
@ -6980,6 +6980,7 @@ sane_close (SANE_Handle handle)
sanei_genesys_buffer_free (&(s->dev->out_buffer)); sanei_genesys_buffer_free (&(s->dev->out_buffer));
FREE_IFNOT_NULL (s->dev->white_average_data); FREE_IFNOT_NULL (s->dev->white_average_data);
FREE_IFNOT_NULL (s->dev->dark_average_data); FREE_IFNOT_NULL (s->dev->dark_average_data);
FREE_IFNOT_NULL (s->dev->calib_file);
/* free allocated gamma tables */ /* free allocated gamma tables */
FREE_IFNOT_NULL (s->dev->sensor.red_gamma_table); FREE_IFNOT_NULL (s->dev->sensor.red_gamma_table);