← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xicc/specplot.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/specplot.c
16
16
/*
17
17
 * This is some test code to test the Daylight and Plankian spectra, 
18
18
 * Correlated and Visual Color Temperatures, and CRI.
19
 
 * and plot a spectrum or cmf.
 
19
 * and plot a spectrum, CMF or CCSS.
20
20
 */
21
21
 
22
22
#include <stdio.h>
181
181
        fprintf(stderr,"usage: specplot [infile.sp]\n");
182
182
        fprintf(stderr," -v               verbose\n");
183
183
        fprintf(stderr," -c               combine multiple files into one plot\n");
184
 
        fprintf(stderr," -z               make range cover zero\n");
 
184
        fprintf(stderr," -z               don't make range cover zero\n");
185
185
        fprintf(stderr," -u level         plot effect of adding estimated UV level\n");
186
186
        fprintf(stderr," -U               plot effect of adding range of estimated UV level\n");
187
187
        fprintf(stderr," [infile.sp ...]  spectrum files to plot\n");
198
198
        int k;
199
199
        int verb = 0;
200
200
        int comb = 0;
201
 
        int zero = 0;
 
201
        int zero = 1;
202
202
        double temp;
203
203
        xspect sp[MAXGRAPHS];
204
204
        icxIllumeType ilType;
250
250
                                comb = 1;
251
251
 
252
252
                        } else if (argv[fa][1] == 'z' || argv[fa][1] == 'Z') {
253
 
                                zero = 1;
 
253
                                zero = 0;
254
254
 
255
255
                        } else {
256
256
                                usage();
289
289
 
290
290
                        /* Read as many spectra from the file as possible */
291
291
                        nreq = MAXGRAPHS - nsp;
292
 
                        if (read_nxspect(&sp[nsp], argv[fa], &nret, soff, nreq, 3) != 0) {
293
 
                                error ("Unable to read custom spectrum or CMF '%s'",argv[fa]);
 
292
                        if (read_nxspect(&sp[nsp], argv[fa], &nret, soff, nreq, 0) != 0) {
 
293
                                error ("Unable to read custom spectrum, CMF or CCSS '%s'",argv[fa]);
294
294
                        }
295
 
                        for (i = 0; i < nret; i++)
 
295
                        for (i = 0; i < nret; i++) {
 
296
                                xspect_denorm(&sp[nsp + i]);
296
297
                                sprintf(buf[nsp + i],"File '%s' spect %d",argv[fa], soff + i);
 
298
                        }
297
299
                        nsp += nret;
298
300
                        soff += nret;
299
301
                        if (nret < nreq) {              /* We're done with this file */
315
317
                                        inm = "C"; break;
316
318
                            case icxIT_D50:
317
319
                                        inm = "D50"; break;
 
320
                            case icxIT_D50M2:
 
321
                                        inm = "D50M2"; break;
318
322
                            case icxIT_D65:
319
323
                                        inm = "D65"; break;
320
324
                            case icxIT_E: