l2001-04-29 Chris Pinkham <cpinkham@infi.net>

* backend/artec.c: Fixed bug causing possible dereference of a NULL
      pointer.
    * backend/artec.desc: Modified USB entry to say AS6E scanner supported
      by SANE AS6E backend.
DEVEL_2_0_BRANCH-1
Chris Pinkham 2001-04-30 02:00:04 +00:00
rodzic 308616ddd3
commit 1af3146faa
2 zmienionych plików z 5 dodań i 3 usunięć

Wyświetl plik

@ -2567,8 +2567,7 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
ARTEC_MAJOR, ARTEC_MINOR, ARTEC_SUB, ARTEC_LAST_MOD); ARTEC_MAJOR, ARTEC_MINOR, ARTEC_SUB, ARTEC_LAST_MOD);
DBG (1, "http://www4.infi.net/~cpinkham/sane-artec-doc.html\n"); DBG (1, "http://www4.infi.net/~cpinkham/sane-artec-doc.html\n");
DBG (7, "sane_init( version_code = %d, callback() = %p )\n", DBG (7, "sane_init()\n" );
*version_code, authorize );
/* make sure these 2 are empty */ /* make sure these 2 are empty */
strcpy (artec_vendor, ""); strcpy (artec_vendor, "");
@ -2577,6 +2576,9 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
if (version_code) if (version_code)
*version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0); *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, 0);
if (authorize)
DBG (7, "sane_init(), authorize callback specified as %p\n", authorize );
fp = sanei_config_open (ARTEC_CONFIG_FILE); fp = sanei_config_open (ARTEC_CONFIG_FILE);
if (!fp) if (!fp)
{ {

Wyświetl plik

@ -42,7 +42,7 @@
:comment "all modes working" :comment "all modes working"
:model "parallel models" :model "parallel models"
:interface "Parport" :interface "Parport"
:comment "Unsupported, see <a href='http://as6edriver.sourceforge.net/'>http://as6edriver.sourceforge.net</a>" :comment "Unsupported, AS6E model is supported by SANE as6e backend."
:model "USB models" :model "USB models"
:interface "USB" :interface "USB"
:comment "Unsupported." :comment "Unsupported."