~ubuntu-branches/ubuntu/trusty/psychtoolbox-3/trusty-proposed

« back to all changes in this revision

Viewing changes to Psychtoolbox/PsychColorimetric/MakeItS.m

  • Committer: Package Import Robot
  • Author(s): Yaroslav Halchenko
  • Date: 2013-11-19 23:34:50 UTC
  • mfrom: (3.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20131119233450-f7nf92vb8qavjmk8
Tags: 3.0.11.20131017.dfsg1-3
Upload to unsable since fresh glew has arrived to sid!

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
[m,n] = size(wls);
17
17
if (isstruct(wls))
18
18
        S = [wls.start wls.step wls.numberSamples];
19
 
elseif (m == 1 & n == 3)
20
 
  if (wls(1) >= 0 & wls(3) > 0)
 
19
elseif (m == 1 && n == 3)
 
20
  if (wls(1) >= 0 && wls(3) > 0)
21
21
    S = wls;
22
22
  else
23
23
    error('Passed wls is not interpretable');