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

Fix various types of unused variable warnings

merge-requests/1/head
Olaf Meeuwissen 2015-09-23 20:11:51 +09:00 zatwierdzone przez m. allan noah
rodzic 5be014ab65
commit 22b17e232a
3 zmienionych plików z 8 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/kodakaio.c
Wyświetl plik

@ -632,7 +632,7 @@ static SANE_String_Const source_list[] = {
}; };
static const SANE_Range percent_range_fixed = {SANE_FIX(0.0), SANE_FIX(100.0), SANE_FIX(1.0)}; static const SANE_Range percent_range_fixed = {SANE_FIX(0.0), SANE_FIX(100.0), SANE_FIX(1.0)};
static const SANE_Range percent_range_int = {0, 100, 1}; /*static const SANE_Range percent_range_int = {0, 100, 1};*/
/* prototypes */ /* prototypes */
static SANE_Status attach_one_usb(SANE_String_Const devname); static SANE_Status attach_one_usb(SANE_String_Const devname);

4
backend/niash.c
Wyświetl plik

@ -985,8 +985,8 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
#ifdef EXPERIMENTAL #ifdef EXPERIMENTAL
SANE_Bool fLampIsOn; SANE_Bool fLampIsOn;
SANE_Bool fVal; SANE_Bool fVal;
#endif
SANE_Bool fSame; SANE_Bool fSame;
#endif
DBG (DBG_MSG, "sane_control_option: option %d, action %d\n", n, Action); DBG (DBG_MSG, "sane_control_option: option %d, action %d\n", n, Action);
@ -1095,8 +1095,10 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action,
return status; return status;
} }
#ifdef EXPERIMENTAL
/* check values if they are equal */ /* check values if they are equal */
fSame = s->aValues[n].w == *(SANE_Word *) pVal; fSame = s->aValues[n].w == *(SANE_Word *) pVal;
#endif
/* set the values */ /* set the values */
s->aValues[n].w = *(SANE_Word *) pVal; s->aValues[n].w = *(SANE_Word *) pVal;

13
sanei/sanei_ir.c
Wyświetl plik

@ -60,8 +60,6 @@ double *
sanei_ir_create_norm_histo (const SANE_Parameters * params, sanei_ir_create_norm_histo (const SANE_Parameters * params,
const SANE_Uint *img_data) const SANE_Uint *img_data)
{ {
uint8_t *img_data8;
SANE_Uint *img_data16;
int is, i; int is, i;
int num_pixels; int num_pixels;
int *histo_data; int *histo_data;
@ -417,8 +415,8 @@ SANE_Status
sanei_ir_RGB_luminance (SANE_Parameters * params, const SANE_Uint **in_img, sanei_ir_RGB_luminance (SANE_Parameters * params, const SANE_Uint **in_img,
SANE_Uint **out_img) SANE_Uint **out_img)
{ {
SANE_Uint *outi, *dest; SANE_Uint *outi;
int itop, is, i; int itop, i;
if ((params->depth < 8) || (params->depth > 16) || if ((params->depth < 8) || (params->depth > 16) ||
(params->format != SANE_FRAME_GRAY)) (params->format != SANE_FRAME_GRAY))
@ -449,7 +447,7 @@ SANE_Status
sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img, sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img,
SANE_Parameters * out_params, SANE_Uint **out_img) SANE_Parameters * out_params, SANE_Uint **out_img)
{ {
SANE_Uint *outi, *src, *dest; SANE_Uint *outi;
size_t ssize; size_t ssize;
int i, is; int i, is;
@ -664,7 +662,6 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
int ndiv, the_sum; int ndiv, the_sum;
int nrow, ncol; int nrow, ncol;
int hwr, hwc; int hwr, hwc;
int depth;
int *sum; int *sum;
int i, j; int i, j;
@ -678,7 +675,6 @@ sanei_ir_filter_mean (const SANE_Parameters * params,
num_cols = params->pixels_per_line; num_cols = params->pixels_per_line;
num_rows = params->lines; num_rows = params->lines;
depth = params->depth;
sum = malloc (num_cols * sizeof (int)); sum = malloc (num_cols * sizeof (int));
if (!sum) if (!sum)
@ -1128,7 +1124,7 @@ sanei_ir_dilate_mean (const SANE_Parameters * params,
SANE_Uint *plane; SANE_Uint *plane;
unsigned int *dist_map, *manhattan; unsigned int *dist_map, *manhattan;
unsigned int *idx_map, *index; unsigned int *idx_map, *index;
int depth, dist; int dist;
int rows, cols; int rows, cols;
int k, i, itop; int k, i, itop;
SANE_Status ret = SANE_STATUS_NO_MEM; SANE_Status ret = SANE_STATUS_NO_MEM;
@ -1136,7 +1132,6 @@ sanei_ir_dilate_mean (const SANE_Parameters * params,
DBG (10, "sanei_ir_dilate_mean(): dist max = %d, expand = %d, win size = %d, smooth = %d, inner = %d\n", DBG (10, "sanei_ir_dilate_mean(): dist max = %d, expand = %d, win size = %d, smooth = %d, inner = %d\n",
dist_max, expand, win_size, smooth, inner); dist_max, expand, win_size, smooth, inner);
depth = params->depth;
cols = params->pixels_per_line; cols = params->pixels_per_line;
rows = params->lines; rows = params->lines;
itop = rows * cols; itop = rows * cols;