[Octave-cvsupdate] SF.net SVN: octave:[8269] trunk/octave-forge/main/io/inst/parsecell.m

[<prn...@us...>]

Revision: 8269
          http://octave.svn.sourceforge.net/octave/?rev=8269&view=rev
Author:   prnienhuis
Date:     2011-05-17 13:10:53 +0000 (Tue, 17 May 2011)

Log Message:
-----------
Bug with "cropping" numeric 1x1 cell arrays fixed

Modified Paths:
--------------
    trunk/octave-forge/main/io/inst/parsecell.m

Modified: trunk/octave-forge/main/io/inst/parsecell.m
===================================================================
--- trunk/octave-forge/main/io/inst/parsecell.m	2011-05-16 21:55:44 UTC (rev 8268)
+++ trunk/octave-forge/main/io/inst/parsecell.m	2011-05-17 13:10:53 UTC (rev 8269)
@@ -59,6 +59,8 @@
 ## 2009-12-29
 ## 2010-08-25 Added option for second argument to be a file ptr
 ## 2010-10-15 Simplified code for numerical array
+## 2011-05-17 Fixed subscript indexing bug in cropping section when rawarr is
+##      "     numeric scalar
 
 function [ numarr, txtarr, lim ] = parsecell (rawarr, arg2=[])
 
@@ -146,7 +148,10 @@
 				rawarr = rawarr (irowt:irowb, icoll:icolr);
 				# Build numerical array
 				numarr = zeros (irowb-irowt+1, icolr-icoll+1);
-				numarr (emptr(irowt:irowb, icoll:icolr)) = NaN;
+				# Watch out for scalar (non-empty) numarr where emptr = 0
+				if (sum (emptr(:)) > 0)
+					numarr (emptr(irowt:irowb, icoll:icolr)) = NaN;
+				endif
 				numarr(~emptr(irowt:irowb, icoll:icolr)) = cell2mat (rawarr(~emptr(irowt:irowb, icoll:icolr)));
 				# Save limits
 				lim.numlimits = [icoll, icolr; irowt, irowb];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.