diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp index d557e32..6aae187 100644 --- a/twain/twain/huagaods.cpp +++ b/twain/twain/huagaods.cpp @@ -2660,13 +2660,8 @@ void huagao_ds::init_support_caps(void) int init = 128, l = 1, u = 255, step = 1, now = 128; int ret = SCANNER_ERR_OK; std::vector all; -#ifdef ARMY_SCANNER - float range_l = .0f, - range_h = 100.0f; -#else float range_l = -1000.0f, range_h = 1000.0f; -#endif GET_SANE_OPT_EX(int, scanner_, bright, NULL, &all); init = all[sane_opts::RANGE_POS_DEFAULT]; now = all[sane_opts::RANGE_POS_CURRENT]; @@ -2719,13 +2714,8 @@ void huagao_ds::init_support_caps(void) l = all[sane_opts::RANGE_POS_LOWER]; u = all[sane_opts::RANGE_POS_UPPER]; step = all[sane_opts::RANGE_POS_STEP]; -#ifdef ARMY_SCANNER - float range_l = .0f, - range_h = 100.0f; -#else float range_l = -1000.0f, range_h = 1000.0f; -#endif float sf = trans_range((float)step, (float)l, (float)u, range_l, range_h, true), nf = trans_range((float)now, (float)l, (float)u, range_l, range_h), initf = trans_range((float)init, (float)l, (float)u, range_l, range_h);