← Back to branch summary

~ubuntu-branches/ubuntu/vivid/hplip/vivid-security

« back to all changes in this revision

Viewing changes to .pc/try_libhpmud.so.0.dpatch/scan/sane/marvell.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2015-02-04 21:18:00 UTC
  • mfrom: (1.8.2)
  • Revision ID: package-import@ubuntu.com-20150204211800-3ahjuezv75ah97zz
Tags: 3.15.2-0ubuntu1
https://launchpad.net/bugs/1388126
https://launchpad.net/bugs/1395676
https://launchpad.net/bugs/1388007
https://launchpad.net/bugs/1187055
https://launchpad.net/bugs/802999
* New upstream release
  - Python3 support for HPLIP
  - Doesn't build against libjpeg-turbo 1.3.90 (LP: #1388126)
  - hpcups crashes if DEVICE_URI not set in environment (LP: #1395676)
  - Incorrect call to hpmudext.device_open (LP: #1388007)
  - plugin download fails if python links to python3 (LP: #1187055)
  - Incorrect IEEE 1284 Device IDs for many models (LP: #802999)
* debian/patches/85_rebuild_python_ui.dpatch: Manually updated to apply to new
  upstream source code.
* debian/patches/hp_photosmart_pro_b9100_support.dpatch,
  debian/patches/simple-scan-as-default.dpatch,
  debian/patches/hpfax-bug-function-used-before-importing-log.dpatch,
  debian/patches/hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch,
  debian/patches/hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch,
  debian/patches/hpaio-option-duplex.diff,
  debian/patches/musb-c-do-not-crash-on-usb-failure.patch,
  debian/patches/process-events-for-systray.patch: Refreshed with quilt.
* debian/rules: Force Python3 build using PYTHON=python3 ./configure option
* debian/rules: Use py3versions to get system's Python3 interpreter version
* debian/rules: Use relative symlink for /usr/sbin/hpssd, so that shebang
  correction works.
* debian/rules: Make sure that the Python interpreter paths in all executables
  use python3.
* debian/rules: Use dh_python3 instead of dh_python2.
* debian/control: Replaced all Python-related dependencies by their
  Python3 equivalent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/try_libhpmud.so.0.dpatch/scan/sane/marvell.c
313
313
   }
314
314
   else
315
315
   {
316
 
     ps->effectiveTlx = 0;  /* current setting is not valid, zero it */
317
 
     ps->effectiveBrx = 0;
318
 
     stat = 1;
 
316
     ps->effectiveTlx = ps->currentTlx = 0;  /* current setting is not valid, zero it */
 
317
     ps->effectiveBrx = ps->currentBrx = ps->brxRange.max;
319
318
   }
320
319
   if ((ps->currentBry > ps->currentTly) && (ps->currentBry - ps->currentTly > ps->min_height) && (ps->currentBry - ps->currentTly <= ps->tlyRange.max))
321
320
   {
324
323
   }
325
324
   else
326
325
   {
327
 
     ps->effectiveTly = 0;  /* current setting is not valid, zero it */
328
 
     ps->effectiveBry = 0;
329
 
     stat = 1;
 
326
    ps->effectiveTly = ps->currentTly = 0;  /* current setting is not valid, zero it */
 
327
    ps->effectiveBry = ps->currentBry = ps->bryRange.max;
330
328
   }
331
329
   return stat;
332
330
}
675
673
         else
676
674
         {  /* Set default. */
677
675
            ps->current_input_source = ps->input_source_map[0];
 
676
            if(ps->current_input_source == IS_PLATEN) 
 
677
            {
 
678
              i = ps->platen_resolution_list[0] + 1;
 
679
              while(i--) ps->resolution_list[i] = ps->platen_resolution_list[i];
 
680
            }
 
681
            else
 
682
            {
 
683
              i = ps->adf_resolution_list[0] + 1;
 
684
              while(i--) ps->resolution_list[i] = ps->adf_resolution_list[i];
 
685
            }
 
686
            ps->current_resolution = ps->resolution_list[1];
678
687
            mset_result |= SANE_INFO_RELOAD_PARAMS | SANE_INFO_RELOAD_OPTIONS;
679
688
            stat = SANE_STATUS_GOOD;
680
689
         }