From: <tho...@us...> - 2012-04-03 20:53:33
|
Revision: 10139 http://octave.svn.sourceforge.net/octave/?rev=10139&view=rev Author: thomas-weber Date: 2012-04-03 20:53:27 +0000 (Tue, 03 Apr 2012) Log Message: ----------- Cope with the change in the behavior of ismatrix() ismatrix([]) used to return 0 in Octave 3.2, but now returns returns 1 in 3.6. Patch from Rafael Laboissiere <ra...@la...> Modified Paths: -------------- trunk/octave-forge/main/fixed/inst/fixedpoint.m Modified: trunk/octave-forge/main/fixed/inst/fixedpoint.m =================================================================== --- trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 20:51:27 UTC (rev 10138) +++ trunk/octave-forge/main/fixed/inst/fixedpoint.m 2012-04-03 20:53:27 UTC (rev 10139) @@ -180,7 +180,7 @@ error ("FAILED"); endif empty = fixed(is,ds,[]); - if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) || + if (isscalar(empty) || !isfixed(empty) || isvector(empty) || !isempty(empty) || isempty(zero)) error ("FAILED"); endif @@ -278,7 +278,7 @@ error ("FAILED"); endif empty = fixed(is*(1+1i),ds*(1+1i),[]); - if (isscalar(empty) || ismatrix(empty) || !isfixed(empty) || + if (isscalar(empty) || !isfixed(empty) || isvector(empty) || !isempty(empty) || isempty(onei) || iscomplex(empty)) ## Not complex, since its type is narrowed!! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |