← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Psychtoolbox/PsychRects/RectCenter.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:
Psychtoolbox/PsychRects/RectCenter.m
20
20
    y = round(0.5*(r(2)+r(4)));
21
21
else
22
22
    % Multi-rect array:
23
 
    if (size(r, 1)==4) & (size(r,2)>=1)
 
23
    if (size(r, 1)==4) && (size(r,2)>=1)
24
24
        % Multi-column array with one 4-comp. rect per column:
25
25
        x = round(0.5*(r(1,:)+r(3,:)));
26
26
        y = round(0.5*(r(2,:)+r(4,:)));
27
27
    else
28
 
        if (size(r, 2)==4) & (size(r,1)>=1)
 
28
        if (size(r, 2)==4) && (size(r,1)>=1)
29
29
            % Multi-row array with one 4-comp. rect per row:
30
30
            x = round(0.5*(r(:,1)+r(:,3)));
31
31
            y = round(0.5*(r(:,2)+r(:,4)));