From 22b17e232a686abf1525d2fc9143436d607b6c49 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Wed, 23 Sep 2015 20:11:51 +0900 Subject: [PATCH] Fix various types of unused variable warnings --- backend/kodakaio.c | 2 +- backend/niash.c | 4 +++- sanei/sanei_ir.c | 13 ++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/backend/kodakaio.c b/backend/kodakaio.c index 970492199..3e55eeede 100644 --- a/backend/kodakaio.c +++ b/backend/kodakaio.c @@ -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_int = {0, 100, 1}; +/*static const SANE_Range percent_range_int = {0, 100, 1};*/ /* prototypes */ static SANE_Status attach_one_usb(SANE_String_Const devname); diff --git a/backend/niash.c b/backend/niash.c index 30f4f54a5..950df2194 100644 --- a/backend/niash.c +++ b/backend/niash.c @@ -985,8 +985,8 @@ sane_control_option (SANE_Handle h, SANE_Int n, SANE_Action Action, #ifdef EXPERIMENTAL SANE_Bool fLampIsOn; SANE_Bool fVal; -#endif SANE_Bool fSame; +#endif 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; } +#ifdef EXPERIMENTAL /* check values if they are equal */ fSame = s->aValues[n].w == *(SANE_Word *) pVal; +#endif /* set the values */ s->aValues[n].w = *(SANE_Word *) pVal; diff --git a/sanei/sanei_ir.c b/sanei/sanei_ir.c index 557f8cc69..aeb0b3b36 100644 --- a/sanei/sanei_ir.c +++ b/sanei/sanei_ir.c @@ -60,8 +60,6 @@ double * sanei_ir_create_norm_histo (const SANE_Parameters * params, const SANE_Uint *img_data) { - uint8_t *img_data8; - SANE_Uint *img_data16; int is, i; int num_pixels; int *histo_data; @@ -417,8 +415,8 @@ SANE_Status sanei_ir_RGB_luminance (SANE_Parameters * params, const SANE_Uint **in_img, SANE_Uint **out_img) { - SANE_Uint *outi, *dest; - int itop, is, i; + SANE_Uint *outi; + int itop, i; if ((params->depth < 8) || (params->depth > 16) || (params->format != SANE_FRAME_GRAY)) @@ -449,7 +447,7 @@ SANE_Status sanei_ir_to_8bit (SANE_Parameters * params, const SANE_Uint *in_img, SANE_Parameters * out_params, SANE_Uint **out_img) { - SANE_Uint *outi, *src, *dest; + SANE_Uint *outi; size_t ssize; int i, is; @@ -664,7 +662,6 @@ sanei_ir_filter_mean (const SANE_Parameters * params, int ndiv, the_sum; int nrow, ncol; int hwr, hwc; - int depth; int *sum; int i, j; @@ -678,7 +675,6 @@ sanei_ir_filter_mean (const SANE_Parameters * params, num_cols = params->pixels_per_line; num_rows = params->lines; - depth = params->depth; sum = malloc (num_cols * sizeof (int)); if (!sum) @@ -1128,7 +1124,7 @@ sanei_ir_dilate_mean (const SANE_Parameters * params, SANE_Uint *plane; unsigned int *dist_map, *manhattan; unsigned int *idx_map, *index; - int depth, dist; + int dist; int rows, cols; int k, i, itop; 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", dist_max, expand, win_size, smooth, inner); - depth = params->depth; cols = params->pixels_per_line; rows = params->lines; itop = rows * cols;