← Back to branch summary

~ubuntu-branches/ubuntu/trusty/argyll/trusty-proposed

« back to all changes in this revision

Viewing changes to xicc/spectest.c

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-02-12 00:35:39 UTC
  • mfrom: (13.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20140212003539-24tautzlitsiz61w
Tags: 1.5.1-5ubuntu1
https://launchpad.net/bugs/1275572
* Merge from Debian unstable. (LP: #1275572) Remaining changes:
  - debian/control:
    + Build-depend on libtiff-dev rather than libtiff4-dev.
  - debian/control, debian/patches/06_fix_udev_rule.patch:
    + Fix udev rules to actually work; ENV{ACL_MANAGE} has
      stopped working ages ago, and with logind it's now the
      "uaccess" tag. Dropping also consolekit from Recommends.
  - debian/patches/drop-usb-db.patch:
    + Use hwdb builtin, instead of the obsolete usb-db
      in the udev rules.
* debian/patches/05_ftbfs-underlinkage.diff:
  - Dropped change, no needed anymore.
* Refresh the patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xicc/spectest.c
630
630
 
631
631
                        /* Create two conversions for the target/check illuminant */
632
632
                        if ((pcon = new_xsp2cie(icxIT_custom, &pill, icxOT_Shaw_Fairchild_2,
633
 
                                               NULL, icSigLabData)) == NULL)
 
633
                                               NULL, icSigLabData, 1)) == NULL)
634
634
                                error ("Creating conversion failed");
635
635
 
636
636
                        if ((scon = new_xsp2cie(icxIT_custom, &pill, icxOT_Shaw_Fairchild_2,
637
 
                                               NULL, icSigLabData)) == NULL)
 
637
                                               NULL, icSigLabData, 1)) == NULL)
638
638
                                error ("Creating conversion failed");
639
639
 
640
640
                        /* Tell the secondary conversion to allow for instrument illuminant */
641
 
                        if (scon->set_fwa(scon, &sill, &matilum[m][ss].white))
 
641
                        if (scon->set_fwa(scon, &sill, NULL, &matilum[m][ss].white))
642
642
                                error ("Setting FWA compensation failed");
643
643
 
644
644
                        printf("Primary (Target/Check) '%s', Secondary (Instrument)'%s'\n",