kopia lustrzana https://gitlab.com/sane-project/backends
Print usefull DBG messages for options without a name. Undef MIN and MAX
macros before defining them. Henning Meier-Geinitz <henning@meier-geinitz.de>DEVEL_2_0_BRANCH-1
rodzic
75a53e20b8
commit
31cfd02f87
|
@ -46,7 +46,7 @@
|
|||
|
||||
/**************************************************************************/
|
||||
/* Mustek backend version */
|
||||
#define BUILD 121
|
||||
#define BUILD 122
|
||||
/**************************************************************************/
|
||||
|
||||
#include "../include/sane/config.h"
|
||||
|
@ -171,9 +171,9 @@ static SANE_String_Const halftone_list[] = {
|
|||
SANE_I18N ("5x5 coarse"), SANE_I18N ("5x5 fine"), SANE_I18N ("4x4 coarse"),
|
||||
SANE_I18N ("4x4 normal"), SANE_I18N ("4x4 fine"), SANE_I18N ("3x3 normal"),
|
||||
SANE_I18N ("2x2 normal"), SANE_I18N ("8x8 custom"),
|
||||
SANE_I18N ("6x6 custom"),
|
||||
SANE_I18N ("6x6 custom"),
|
||||
SANE_I18N ("5x5 custom"), SANE_I18N ("4x4 custom"),
|
||||
SANE_I18N ("3x3 custom"),
|
||||
SANE_I18N ("3x3 custom"),
|
||||
SANE_I18N ("2x2 custom"),
|
||||
0
|
||||
};
|
||||
|
@ -5479,7 +5479,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
|
|||
DBG (1, "sane_get_option_descriptor: handle is null!\n");
|
||||
return 0;
|
||||
}
|
||||
if (s->opt[option].name)
|
||||
if (s->opt[option].name && s->opt[option].name[0] != 0)
|
||||
DBG (5, "sane_get_option_descriptor for option %s (%sactive%s)\n",
|
||||
s->opt[option].name,
|
||||
s->opt[option].cap & SANE_CAP_INACTIVE ? "in" : "",
|
||||
|
@ -5517,7 +5517,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
|
|||
return SANE_STATUS_INVAL;
|
||||
}
|
||||
|
||||
if (s->opt[option].name)
|
||||
if (s->opt[option].name && s->opt[option].name[0] != 0)
|
||||
DBG (5, "sane_control_option (%s option %s)\n",
|
||||
action == SANE_ACTION_GET_VALUE ? "get" :
|
||||
(action == SANE_ACTION_SET_VALUE ? "set" : "unknown action with"),
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
CHANGES for the SANE Mustek backend
|
||||
|
||||
2002-04-24:
|
||||
* Released Mustek backend 1.0-122.
|
||||
|
||||
2002-04-24:
|
||||
* Undef MIN and MAX if they are defined in mustek.h to avoid warnings.
|
||||
|
||||
2002-04-22:
|
||||
* Fixed debug output in sane_control_option and sane_get_device_descriptor.
|
||||
|
||||
2002-04-10:
|
||||
* Released Mustek backend 1.0-121.
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue