← Back to branch summary

~ubuntu-branches/ubuntu/vivid/hplip/vivid-proposed

« back to all changes in this revision

Viewing changes to scan/sane/ledm.c

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2013-08-17 12:27:56 UTC
  • mfrom: (38.1.2 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130817122756-3bqj73ysasf646s8
Tags: 3.13.8-1
* New Upstream Release 
* Update Vcs: header
* Fixup field "section" in package hpijs-ppds
* Update libhpmud-dev Description: - duplicate-long-description
* Update debian/copyright - fixes copyright-refers-to-symlink-license
* Update Description: - fixes extended-description-is-probably-too-short

Show diffs side-by-side

added added

removed removed

Lines of Context:
scan/sane/ledm.c
267
267
  ps->option[LEDM_OPTION_GROUP_ADVANCED].type = SANE_TYPE_GROUP;
268
268
  ps->option[LEDM_OPTION_GROUP_ADVANCED].cap = SANE_CAP_ADVANCED;
269
269
 
 
270
  ps->option[LEDM_OPTION_BRIGHTNESS].name = SANE_NAME_BRIGHTNESS;
 
271
  ps->option[LEDM_OPTION_BRIGHTNESS].title = SANE_TITLE_BRIGHTNESS;
 
272
  ps->option[LEDM_OPTION_BRIGHTNESS].desc = SANE_DESC_BRIGHTNESS;
 
273
  ps->option[LEDM_OPTION_BRIGHTNESS].type = SANE_TYPE_INT;
 
274
  ps->option[LEDM_OPTION_BRIGHTNESS].unit = SANE_UNIT_NONE;
 
275
  ps->option[LEDM_OPTION_BRIGHTNESS].size = sizeof(SANE_Int);
 
276
  ps->option[LEDM_OPTION_BRIGHTNESS].cap = SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT | SANE_CAP_ADVANCED;
 
277
  ps->option[LEDM_OPTION_BRIGHTNESS].constraint_type = SANE_CONSTRAINT_RANGE;
 
278
  ps->option[LEDM_OPTION_BRIGHTNESS].constraint.range = &ps->brightnessRange;
 
279
  ps->brightnessRange.min = LEDM_BRIGHTNESS_MIN;
 
280
  ps->brightnessRange.max = LEDM_BRIGHTNESS_MAX;
 
281
  ps->brightnessRange.quant = 0;
 
282
 
270
283
  ps->option[LEDM_OPTION_CONTRAST].name = SANE_NAME_CONTRAST;
271
284
  ps->option[LEDM_OPTION_CONTRAST].title = SANE_TITLE_CONTRAST;
272
285
  ps->option[LEDM_OPTION_CONTRAST].desc = SANE_DESC_CONTRAST;
406
419
  /* Set supported contrast. */
407
420
  ledm_control_option(session, LEDM_OPTION_CONTRAST, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
408
421
 
 
422
  /* Set supported brightness. */
 
423
  ledm_control_option(session, LEDM_OPTION_BRIGHTNESS, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
 
424
 
409
425
  /* Set supported compression. (Note, cm1017 may say it supports MMR, but it doesn't) */
410
426
  ledm_control_option(session, LEDM_OPTION_COMPRESSION, SANE_ACTION_SET_AUTO, NULL, NULL); /* set default option */
411
427
 
612
628
            stat = SANE_STATUS_GOOD;
613
629
         }
614
630
         break;
 
631
      case LEDM_OPTION_BRIGHTNESS:
 
632
         if (action == SANE_ACTION_GET_VALUE)
 
633
         {
 
634
            *int_value = ps->currentBrightness;
 
635
            stat = SANE_STATUS_GOOD;
 
636
         }
 
637
         else if (action == SANE_ACTION_SET_VALUE)
 
638
         {
 
639
            if (*int_value >= LEDM_BRIGHTNESS_MIN && *int_value <= LEDM_BRIGHTNESS_MAX)
 
640
            {
 
641
               ps->currentBrightness = *int_value;
 
642
            }
 
643
            else
 
644
            {
 
645
              ps->currentBrightness = LEDM_BRIGHTNESS_DEFAULT;
 
646
            }
 
647
            stat = SANE_STATUS_GOOD;
 
648
         }
 
649
         else
 
650
         {  /* Set default. */
 
651
            ps->currentBrightness = LEDM_BRIGHTNESS_DEFAULT;
 
652
            stat = SANE_STATUS_GOOD;
 
653
         }
 
654
         break;
615
655
      case LEDM_OPTION_COMPRESSION:
616
656
         if (action == SANE_ACTION_GET_VALUE)
617
657
         {